From 1afa9fe4c6b88e310f4400da3b4e9e4b39a81176 Mon Sep 17 00:00:00 2001
From: Matt Robinson <mattrob@hey.com>
Date: Wed, 25 Oct 2023 07:07:40 -0600
Subject: [PATCH] Use remote cache when building in xcodeproj on CI (#788)

Attempt to speed up the slow `.xcodeproj Tests on Xcode 14.2.0` job on CI.
---
 .github/workflows/preflight_env.sh |  6 +++++-
 .github/workflows/tests.yml        | 29 +++++++++--------------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/preflight_env.sh b/.github/workflows/preflight_env.sh
index 6ffc1d744..515911ef6 100755
--- a/.github/workflows/preflight_env.sh
+++ b/.github/workflows/preflight_env.sh
@@ -2,7 +2,11 @@
 
 # If flag --no-bzlmod is passed, writes a user.bazelrc file to disable Bzlmod.
 if [[ "$*" == *--no-bzlmod* ]]; then
-  echo "build --noexperimental_enable_bzlmod" > user.bazelrc
+  echo "build --noexperimental_enable_bzlmod" >> user.bazelrc
+fi
+# If flag --use-remote-cache is passed, writes a user.bazelrc file to enable remote cache.
+if [[ "$*" == *--use-remote-cache* ]]; then
+  echo "build --config=ci_with_caches" >> user.bazelrc
 fi
 
 set -e
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3c1dfd3be..7af59f8ef 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,12 +18,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Preflight Env
-        run: .github/workflows/preflight_env.sh
+        run: .github/workflows/preflight_env.sh --use-remote-cache
       - name: Build and Test
         run: |
           # non-iOS tests
           bazelisk test \
-            --config=ci_with_caches \
             -- \
             //... \
             -//tests/ios/...
@@ -36,7 +35,6 @@ jobs:
 
           # iOS tests
           bazelisk test \
-            --config=ci_with_caches \
             --config=ios \
             --test_arg=--destination=platform=ios_simulator,id=$SIMULATOR_UDID \
             -- \
@@ -57,12 +55,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Preflight Env
-        run: .github/workflows/preflight_env.sh
+        run: .github/workflows/preflight_env.sh --use-remote-cache
       - name: Build and Test
         run: |
           # non-iOS tests
           bazelisk test \
-            --config=ci_with_caches \
             --config=vfs \
             -- \
             //... \
@@ -70,7 +67,6 @@ jobs:
 
           # iOS tests
           bazelisk test \
-            --config=ci_with_caches \
             --config=ios \
             --config=vfs \
             -- \
@@ -91,13 +87,12 @@ jobs:
       - uses: actions/checkout@v3
       - name: Preflight Env
         # Dont test Bazel 5 with bzlmod
-        run: .github/workflows/preflight_env.sh --no-bzlmod
+        run: .github/workflows/preflight_env.sh --no-bzlmod --use-remote-cache
       - name: Build and Test
         run: |
           # iOS tests without bzlmod on Bazel 5
           bazelisk build \
             --noexperimental_enable_bzlmod \
-            --config=ci_with_caches \
             --config=ios \
             --config=vfs \
             -- \
@@ -117,12 +112,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Preflight Env
-        run: .github/workflows/preflight_env.sh --no-bzlmod
+        run: .github/workflows/preflight_env.sh --no-bzlmod --use-remote-cache
       - name: Build and Test
         run: |
           # iOS tests
           bazelisk build \
-            --config=ci_with_caches \
             --config=ios \
             --config=vfs \
             -- \
@@ -140,11 +134,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Preflight Env
-        run: .github/workflows/preflight_env.sh
+        run: .github/workflows/preflight_env.sh --use-remote-cache
       - name: Build and Test
         run: |
           bazelisk build \
-            --config=ci_with_caches \
             --config=vfs \
             --ios_multi_cpus=sim_arm64  \
             -- \
@@ -154,7 +147,6 @@ jobs:
           # Misc issues:
           #   - Fails on a non fat framework for //tests/ios/unit-test/test-imports-app/
           bazelisk build \
-            --config=ci_with_caches \
             --config=ios \
             --config=vfs \
             --ios_multi_cpus=sim_arm64 \
@@ -174,7 +166,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Preflight Env
-        run: .github/workflows/preflight_env.sh
+        run: .github/workflows/preflight_env.sh --use-remote-cache
         # Note: we need to pass the absolute to the Bazel run
       - name: buildifier
         run: |
@@ -183,7 +175,6 @@ jobs:
       - name: Check docs
         run: |
           bazelisk run \
-            --config=ci_with_caches \
             //docs
           git diff --exit-code docs
 
@@ -193,7 +184,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Preflight Env
-        run: .github/workflows/preflight_env.sh --no-bzlmod
+        run: .github/workflows/preflight_env.sh --no-bzlmod --use-remote-cache
       - name: Run tests
         run: ./tests/xcodeproj-tests.sh --run && ./tests/test-tests.sh
       - uses: actions/upload-artifact@v2
@@ -208,11 +199,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Preflight Env
-        run: .github/workflows/preflight_env.sh
+        run: .github/workflows/preflight_env.sh --use-remote-cache
       - name: Run tests
         run: |
           bazelisk test \
-            --config=ci_with_caches \
             --config=ios_lldb_test \
             -- \
             tests/ios/lldb/app:objc_app_po_test \
@@ -234,11 +224,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Preflight Env
-        run: .github/workflows/preflight_env.sh --no-bzlmod
+        run: .github/workflows/preflight_env.sh --no-bzlmod --use-remote-cache
       - name: Build App
         run: |
           bazelisk build \
-            --config=ci_with_caches \
             --config=ios_multi_arch_test \
             -- \
             tests/ios/app/App