Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(desktop): ship the codec-enabled CEF framework and unblock unpinned builds (#9242)
Eric Hayesb18b17a8feb5
diff --git a/.github/workflows/build_cef_codecs.yml b/.github/workflows/build_cef_codecs.ymlindex cfc6fe31f5..520fb376a8 100644--- a/.github/workflows/build_cef_codecs.yml+++ b/.github/workflows/build_cef_codecs.yml@@ -68,6 +68,8 @@ jobs:export GN_DEFINES="is_official_build=true proprietary_codecs=true ffmpeg_branding=Chrome chrome_pgo_phase=0 symbol_level=0"export CEF_ARCHIVE_FORMAT=tar.bz2+ # make_distrib copies the macOS framework out of cefclient.app, so building+ # only cefsimple yields an archive with headers but no framework.python3 "$work/automate-git.py" \--download-dir="$work/code" \--depot-tools-dir="$work/depot_tools" \@@ -78,7 +80,7 @@ jobs:--minimal-distrib-only \--no-distrib-docs \--no-chromium-history \- --build-target=cefsimple+ --build-target=cefclientdistrib="$work/code/chromium/src/cef/binary_distrib"built="$distrib/cef_binary_${cef_version}_macosarm64_minimal.tar.bz2"@@ -98,6 +100,13 @@ jobs:fidone+ framework="Release/Chromium Embedded Framework.framework/Chromium Embedded Framework"+ listing=$(tar -tjf "$built")+ if ! grep -qF "/$framework" <<<"$listing"; then+ echo "$built has no $framework" >&2+ exit 1+ fi+mkdir -p "$RUNNER_TEMP/out"cp "$built" "$RUNNER_TEMP/out/$asset"sha256=$(shasum -a 256 "$RUNNER_TEMP/out/$asset" | awk '{print $1}')diff --git a/apps/web/tauri/desktop-cef/AGENTS.md b/apps/web/tauri/desktop-cef/AGENTS.mdindex e219eea487..1a51bdf1ed 100644--- a/apps/web/tauri/desktop-cef/AGENTS.md+++ b/apps/web/tauri/desktop-cef/AGENTS.md@@ -53,7 +53,8 @@ thin binary over `../src-tauri` (`app_lib::run_with`) that selects`CEF_PATH` to an extracted codec distribution (below) to test media.- Releases embed CEF built with proprietary codecs, pinned in `cef-codecs.json`and laid out by `nix/tauri-desktop.nix`; Nix evaluation fails if that pin- doesn't match the `cef` crate in `Cargo.lock`. To bump the `cef` crate, put+ doesn't match the `cef` crate in `Cargo.lock`. While `sha256` is empty, Nix+ warns and builds with the codec-less CDN CEF. To bump the `cef` crate, putthe new CDN version (`cefVersion`, its `g<hash>` as `cefCommit`, the Chromiumbranch) and a new `releaseTag`/`asset` in the manifest with an empty `sha256`on a PR. The `Build CEF with codecs` workflow then builds and publishes itdiff --git a/apps/web/tauri/desktop-cef/cef-codecs.json b/apps/web/tauri/desktop-cef/cef-codecs.jsonindex dfbdc0d56e..b6eb44e2f6 100644--- a/apps/web/tauri/desktop-cef/cef-codecs.json+++ b/apps/web/tauri/desktop-cef/cef-codecs.json@@ -4,5 +4,5 @@"chromiumBranch": "7922","releaseTag": "cef-codecs-151.3.24-g2384915","asset": "cef_binary_151.3.24_macosarm64_codecs_minimal.tar.bz2",- "sha256": ""+ "sha256": "d5605e50a736b8e107a58ea900d63e6893d4a66d00dda580976378f4de5d52d2"}diff --git a/nix/tauri-desktop.nix b/nix/tauri-desktop.nixindex d4fa1825c0..26be7e2044 100644--- a/nix/tauri-desktop.nix+++ b/nix/tauri-desktop.nix@@ -970,14 +970,17 @@cef = lib.findFirst (p: p.name == "cef") null lock.package;inlib.last (lib.splitString "+" cef.version);+ # An empty sha256 means the codec build for a new CEF version is still+ # pending; build with the CDN CEF meanwhile rather than block releases.+ cefCodecsPinned =+ assert lib.assertMsg (cefCodecsVersion == cefCrateVersion)+ "desktop-cef loads CEF ${cefCrateVersion} but cef-codecs.json pins ${cefCodecsVersion}; update the manifest and rebuild";+ lib.warnIf (cefCodecs.sha256 == "")+ "apps/web/tauri/desktop-cef/cef-codecs.json has no sha256; building with the CDN CEF, which cannot play H.264, HEVC, or AAC"+ (cefCodecs.sha256 != "");cefCodecsArchive = pkgs.fetchurl {url = "https://github.com/macro-inc/macro/releases/download/${cefCodecs.releaseTag}/${cefCodecs.asset}";- sha256 =- assert lib.assertMsg (cefCodecsVersion == cefCrateVersion)- "desktop-cef loads CEF ${cefCrateVersion} but cef-codecs.json pins ${cefCodecsVersion}; update the manifest and rebuild";- assert lib.assertMsg (cefCodecs.sha256 != "")- "apps/web/tauri/desktop-cef/cef-codecs.json has no sha256; run the `Build CEF with codecs` workflow and pin its output";- cefCodecs.sha256;+ inherit (cefCodecs) sha256;};cefCodecsDistribution = pkgs.runCommand "cef-codecs-${cefCodecsVersion}" { } ''tar -xjf ${cefCodecsArchive}@@ -1017,9 +1020,13 @@preBuild = ''export PATH="$PATH:/usr/bin:/bin:/usr/sbin:/sbin"export CEF_PATH="$TMPDIR/tauri-cef"+ ''+ + lib.optionalString cefCodecsPinned ''mkdir -p "$CEF_PATH"cp -R ${cefCodecsDistribution}/. "$CEF_PATH/"chmod -R u+w "$CEF_PATH"+ ''+ + ''cp ${../apps/web/package.json} apps/web/package.jsonrm -rf apps/web/distcp -r ${frontend} apps/web/distdiff --git a/tooling/xtask/crates/xtask_workflows/src/workflows/build_cef_codecs/test.rs b/tooling/xtask/crates/xtask_workflows/src/workflows/build_cef_codecs/test.rsindex cfec4570bd..5f6d1f84d2 100644--- a/tooling/xtask/crates/xtask_workflows/src/workflows/build_cef_codecs/test.rs+++ b/tooling/xtask/crates/xtask_workflows/src/workflows/build_cef_codecs/test.rs@@ -19,5 +19,7 @@ fn builds_with_proprietary_codecs() {let yaml = rendered();assert!(yaml.contains("proprietary_codecs=true"), "{yaml}");assert!(yaml.contains("ffmpeg_branding=Chrome"), "{yaml}");+ // make_distrib takes the macOS framework from cefclient.app.+ assert!(yaml.contains("--build-target=cefclient"), "{yaml}");assert!(yaml.contains("--prerelease --latest=false"), "{yaml}");}diff --git a/tooling/xtask/crates/xtask_workflows/src/workflows/scripts/build_cef_codecs.sh b/tooling/xtask/crates/xtask_workflows/src/workflows/scripts/build_cef_codecs.shindex b6e968e2f9..6feaa4e6cd 100644--- a/tooling/xtask/crates/xtask_workflows/src/workflows/scripts/build_cef_codecs.sh+++ b/tooling/xtask/crates/xtask_workflows/src/workflows/scripts/build_cef_codecs.sh@@ -40,6 +40,8 @@ curl -fsSL --retry 5 \export GN_DEFINES="is_official_build=true proprietary_codecs=true ffmpeg_branding=Chrome chrome_pgo_phase=0 symbol_level=0"export CEF_ARCHIVE_FORMAT=tar.bz2+# make_distrib copies the macOS framework out of cefclient.app, so building+# only cefsimple yields an archive with headers but no framework.python3 "$work/automate-git.py" \--download-dir="$work/code" \--depot-tools-dir="$work/depot_tools" \@@ -50,7 +52,7 @@ python3 "$work/automate-git.py" \--minimal-distrib-only \--no-distrib-docs \--no-chromium-history \- --build-target=cefsimple+ --build-target=cefclientdistrib="$work/code/chromium/src/cef/binary_distrib"built="$distrib/cef_binary_${cef_version}_macosarm64_minimal.tar.bz2"@@ -70,6 +72,13 @@ for arg in 'proprietary_codecs *= *true' 'ffmpeg_branding *= *"Chrome"'; dofidone+framework="Release/Chromium Embedded Framework.framework/Chromium Embedded Framework"+listing=$(tar -tjf "$built")+if ! grep -qF "/$framework" <<<"$listing"; then+ echo "$built has no $framework" >&2+ exit 1+fi+mkdir -p "$RUNNER_TEMP/out"cp "$built" "$RUNNER_TEMP/out/$asset"sha256=$(shasum -a 256 "$RUNNER_TEMP/out/$asset" | awk '{print $1}')