build: use buck to build chromium for macOS

.buildkite/pipeline.yml

@@ -49,8 +49,10 @@ steps:
       - "be_cmd git-fetch-all -- git fetch --all"
       - "be_cmd git-reset-branch -- git reset --hard origin/$BUILDKITE_BRANCH"
       - "be_cmd update-all-repos -- node replay_build_scripts/update-all-repos.mjs"
-      - "be_cmd buildMac -- node buildMac.mjs"
-      - "be_cmd upload-artifacts -- node replay_build_scripts/upload_build_artifacts.mjs"
+      - "pushd ../backend"
+      - "be_cmd buck2-kill -- buckle kill"
+      - "be_cmd buck2-build -- buckle build --console simple //:chromium"
+      - "popd"
     env:
       GOMA_SERVER_HOST: simpsonite.goma.engflow.com
       GOMACTL_USE_PROXY: false
@@ -77,8 +79,10 @@ steps:
       - "be_cmd git-fetch-all -- git fetch --all"
       - "be_cmd git-reset-branch -- git reset --hard origin/$BUILDKITE_BRANCH"
       - "be_cmd update-all-repos -- node replay_build_scripts/update-all-repos.mjs"
-      - "be_cmd buildMac -- node buildMac.mjs"
-      - "be_cmd upload-artifacts -- node replay_build_scripts/upload_build_artifacts.mjs"
+      - "pushd ../backend"
+      - "be_cmd buck2-kill -- buckle kill"
+      - "be_cmd buck2-build -- buckle build --console simple //:chromium"
+      - "popd"
     env:
       GOMA_SERVER_HOST: simpsonite.goma.engflow.com
       GOMACTL_USE_PROXY: false
@@ -131,7 +135,7 @@ steps:
     command: "be_cmd metabase-tests -- /home/ubuntu/chromium/src/replay_build_scripts/metabase.sh"
 
   # wait for all steps above, but also continue if they fail
-  - wait: ~ 
+  - wait: ~
     continue_on_failure: true
 
   - label: "Buildevents Watch"

REPLAY_BACKEND_REV

@@ -1 +1 @@
-1edf15bdb198814b4bd5b73c095cd7a1f31df354
+12ba81f2625a89585e53a210f211eb0380832039

buildLinux.mjs

@@ -1,9 +1,6 @@
 // Script used by buildkite to build Chromium for Linux in CI
 import path from "path";
-import {
-  spawnChecked,
-  updateChromiumRepo,
-} from "./replay_build_scripts/common.mjs";
+import { spawnChecked } from "./replay_build_scripts/common.mjs";
 
 const dockerArgs = [
   "run",

buildMac.mjs

@@ -1,7 +1,4 @@
 // Script used by buildkite to build Chromium for macOS in CI
-import {
-  spawnChecked,
-  updateChromiumRepo,
-} from "./replay_build_scripts/common.mjs";
+import { spawnChecked } from "./replay_build_scripts/common.mjs";
 
 spawnChecked("node", ["build.js"], { stdio: "inherit" });

buildWindows.mjs

@@ -1,8 +1,5 @@
 // Script used by buildkite to build Chromium for Windows in CI
-import {
-  spawnChecked,
-  updateChromiumRepo,
-} from "./replay_build_scripts/common.mjs";
+import { spawnChecked } from "./replay_build_scripts/common.mjs";
 
 // TODO(dmiller): remove this hack when we switch to the new ci system
 spawnChecked("git", ["apply", "replay_build_scripts/windows.patch"]);

replay_build_scripts/upload_build_artifacts.mjs

@@ -160,7 +160,8 @@ function prepareWindowsBinaries(buildId) {
 }
 
 function prepareMacOSBinaries(buildId) {
-  const dmgArchive = buildArm ? `${buildId}-arm.dmg` : `${buildId}.dmg`;
+  const buildIdDmgArchive = buildArm ? `${buildId}-arm.dmg` : `${buildId}.dmg`;
+  const dmgArchive = buildArm ? "macos-chromium-arm.dmg" : "macos-chromium.dmg";
   const outdir = buildArm ? "out/Release-ARM" : "out/Release";
   fs.rmSync(path.join(outdir, "Replay-Chromium.app"), {
     recursive: true,
@@ -174,7 +175,7 @@ function prepareMacOSBinaries(buildId) {
     "hdiutil",
     [
       "create",
-      path.join(process.cwd(), dmgArchive),
+      path.join(process.cwd(), buildIdDmgArchive),
       "-ov",
       "-volname",
       "Replay-Chromium",
@@ -185,19 +186,27 @@ function prepareMacOSBinaries(buildId) {
     ],
     { cwd: outdir, stdio: "inherit" }
   );
-  const tarArchive = buildArm ? `${buildId}-arm.tar.xz` : `${buildId}.tar.xz`;
+  const buildIdTarArchive = buildArm
+    ? `${buildId}-arm.tar.xz`
+    : `${buildId}.tar.xz`;
+  const tarArchive = buildArm
+    ? "macos-chromium-arm.tar.xz"
+    : "macos-chromium.tar.xz";
 
   spawnChecked(
     "tar",
-    ["cfJ", path.join(process.cwd(), tarArchive), "Replay-Chromium.app"],
+    ["cfJ", path.join(process.cwd(), buildIdTarArchive), "Replay-Chromium.app"],
     { cwd: outdir }
   );
   fs.renameSync(
     path.join(outdir, "Replay-Chromium.app"),
     path.join(outdir, "Chromium.app")
   );
 
-  return [dmgArchive, tarArchive];
+  fs.cpSync(buildIdDmgArchive, dmgArchive);
+  fs.cpSync(buildIdTarArchive, tarArchive);
+
+  return [buildIdDmgArchive, buildIdTarArchive];
 }
 
 async function main(options) {