Merge pull request #2056 from tweag/cg/use_config_bazel_remote_cache_…

…auth chore: update to use `tweag/configure-bazel-remote-cache-auth`
tweag · Nov 29, 2023 · 267933e · 267933e
2 parents c41df1f + 00e2780
commit 267933e
Showing 1 changed file with 10 additions and 18 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -85,9 +85,11 @@ jobs:
           extra_nix_config: |
             trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
             extra-substituters = https://cache.iog.io
+      - uses: tweag/configure-bazel-remote-cache-auth@v0
+        with:
+          buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
+          bazelrc_path: .bazelrc.local
       - name: Configure
-        env:
-          BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
         run: |
           # Avoid failures of the form `deadline exceeded after 14999958197ns DEADLINE_EXCEEDED`.
           # See https://github.com/tweag/rules_haskell/issues/1498 and https://github.com/tweag/rules_haskell/pull/1692.
@@ -96,15 +98,9 @@ jobs:
             macOS) BUILD_CONFIG=ci-macos-nixpkgs;;
             Linux) BUILD_CONFIG=ci-linux-nixpkgs;;
           esac
-          if [ -z "$BUILDBUDDY_API_KEY" ]; then
-              cache_setting='--noremote_upload_local_results'
-          else
-              cache_setting="--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY"
-          fi
-          cat >.bazelrc.local <<EOF
+          cat >>.bazelrc.local <<EOF
           common --config=ci
           build --config=$BUILD_CONFIG
-          build $cache_setting
           common --enable_bzlmod=${{ matrix.bzlmod }}
           EOF
           cp .bazelrc.local rules_haskell_nix
@@ -203,9 +199,11 @@ jobs:
           BAZEL_DIR="$(.ci/fetch-bazel-bindist)"
           mv $BAZEL_DIR $HOME/bazel
           echo "$HOME/bazel" >> "$GITHUB_PATH"
+      - uses: tweag/configure-bazel-remote-cache-auth@v0
+        with:
+          buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
+          bazelrc_path: .bazelrc.local
       - name: Configure
-        env:
-          BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
         shell: bash
         run: |
           # Avoid failures of the form `deadline exceeded after 14999958197ns DEADLINE_EXCEEDED`.
@@ -217,11 +215,6 @@ jobs:
             Windows,rules_haskell) BUILD_CONFIG=ci-windows-bindist-rules-haskell;;
             Windows,rules_haskell_tests) BUILD_CONFIG=ci-windows-bindist-rules-haskell-tests;;
           esac
-          if [ -z "$BUILDBUDDY_API_KEY" ]; then
-              cache_setting='--noremote_upload_local_results'
-          else
-              cache_setting="--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY"
-          fi
           if [[ ${{ runner.os }} == Windows ]]; then
               output_root_setting="startup --output_user_root=C:/_bzl"
               # On windows, we use a separate remote cache for bzlmod,
@@ -235,10 +228,9 @@ jobs:
               output_root_setting=""
               bzlmod_cache_silo_key=""
           fi
-          cat >.bazelrc.local <<EOF
+          cat >>.bazelrc.local <<EOF
           common --config=ci
           build --config=$BUILD_CONFIG
-          build $cache_setting
           $output_root_setting
           $bzlmod_cache_silo_key
           common --enable_bzlmod=${{ matrix.bzlmod }}