From c5400544b0937cf830acbf35d6e2af5f9b82949a Mon Sep 17 00:00:00 2001
From: Dan Crosby <dan@danielcrosby.net>
Date: Tue, 7 Jul 2026 11:37:09 -0700
Subject: [PATCH] Sync Bazel Xcode config before Bazel tests (#8318)

* Sync Bazel Xcode config before Bazel tests

* Sync Xcode config across Bazel CI paths
---
 .github/workflows/bazel_test.yml   | 4 ++++
 .github/workflows/docker_build.yml | 6 ++++++
 scripts/build_eagle_ci.sh          | 4 ++++
 scripts/build_shardok_ci.sh        | 4 ++++
 4 files changed, 18 insertions(+)

diff --git a/.github/workflows/bazel_test.yml b/.github/workflows/bazel_test.yml
index 1e2dad0e36..28d17ea518 100644
--- a/.github/workflows/bazel_test.yml
+++ b/.github/workflows/bazel_test.yml
@@ -15,6 +15,7 @@ on:
       - '.clang-tidy'
       - 'scripts/run-clang-tidy.sh'
       - 'scripts/check_shardok_clang_tidy.sh'
+      - 'scripts/sync_bazel_xcode.sh'
       - '.github/actions/setup-bazel/**'
       - '.github/workflows/bazel_test.yml'
       - '!src/main/csharp/**'
@@ -32,6 +33,7 @@ on:
       - '.clang-tidy'
       - 'scripts/run-clang-tidy.sh'
       - 'scripts/check_shardok_clang_tidy.sh'
+      - 'scripts/sync_bazel_xcode.sh'
       - '.github/actions/setup-bazel/**'
       - '.github/workflows/bazel_test.yml'
       - '!src/main/csharp/**'
@@ -120,6 +122,8 @@ jobs:
         lfs: false
     - name: Setup Bazel
       uses: ./.github/actions/setup-bazel
+    - name: Sync Bazel Xcode config
+      run: ./scripts/sync_bazel_xcode.sh
     - name: Run tests
       run: bazel test --build_event_json_file=test.json //src/test/... //src/main/go/...
     - name: Summarize Bazel build metrics
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index e872d86573..0b3ab75a4c 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -19,6 +19,7 @@ on:
       - 'src/main/resources/**'
       - 'ci/BUILD.bazel'
       - 'ci/github_actions/ensure_bazel_installed.sh'
+      - 'scripts/sync_bazel_xcode.sh'
       - '.github/actions/setup-bazel/**'
       - 'MODULE.bazel'
       - 'MODULE.bazel.lock'
@@ -41,6 +42,7 @@ on:
       - 'ci/BUILD.bazel'
       - 'ci/github_actions/ensure_bazel_installed.sh'
       - 'ci/github_actions/fetch_lfs.sh'
+      - 'scripts/sync_bazel_xcode.sh'
       - '.github/actions/setup-bazel/**'
       - 'go.mod'
       - 'go.sum'
@@ -125,6 +127,10 @@ jobs:
         if: steps.check-latest.outputs.skip != 'true'
         uses: ./.github/actions/setup-bazel
 
+      - name: Sync Bazel Xcode config
+        if: steps.check-latest.outputs.skip != 'true'
+        run: ./scripts/sync_bazel_xcode.sh
+
       - name: Fetch LFS files needed for admin server
         if: steps.check-latest.outputs.skip != 'true'
         env:
diff --git a/scripts/build_eagle_ci.sh b/scripts/build_eagle_ci.sh
index c667525a65..d0d34960df 100755
--- a/scripts/build_eagle_ci.sh
+++ b/scripts/build_eagle_ci.sh
@@ -10,4 +10,8 @@ if [ -n "${BAZEL_OUTPUT_BASE:-}" ]; then
     bazel_cmd+=("--output_base=${BAZEL_OUTPUT_BASE}")
 fi
 
+if [ "$(uname -s)" = "Darwin" ]; then
+    ./scripts/sync_bazel_xcode.sh
+fi
+
 "${bazel_cmd[@]}" build "$@" //src/main/scala/net/eagle0/eagle:eagle_server
diff --git a/scripts/build_shardok_ci.sh b/scripts/build_shardok_ci.sh
index ecb6d35ff1..26f67fc418 100755
--- a/scripts/build_shardok_ci.sh
+++ b/scripts/build_shardok_ci.sh
@@ -10,4 +10,8 @@ if [ -n "${BAZEL_OUTPUT_BASE:-}" ]; then
     bazel_cmd+=("--output_base=${BAZEL_OUTPUT_BASE}")
 fi
 
+if [ "$(uname -s)" = "Darwin" ]; then
+    ./scripts/sync_bazel_xcode.sh
+fi
+
 "${bazel_cmd[@]}" build -c opt "$@" //src/main/cpp/net/eagle0/shardok:shardok-server