ci/bazel: Fix repo config (#37349)

Signed-off-by: Ryan Northey <ryan@synca.io>
envoyproxy · Nov 25, 2024 · 7c1b8f5 · 7c1b8f5
1 parent a3fbd36
commit 7c1b8f5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -551,6 +551,9 @@ common:remote-envoy-engflow --config=common-envoy-engflow
 common:remote-envoy-engflow --config=cache-envoy-engflow
 common:remote-envoy-engflow --config=rbe-envoy-engflow
 
+common:remote-cache-envoy-engflow --config=common-envoy-engflow
+common:remote-cache-envoy-engflow --config=cache-envoy-engflow
+
 # Specifies the rustfmt.toml for all rustfmt_test targets.
 build --@rules_rust//rust/settings:rustfmt.toml=//:rustfmt.toml
 

diff --git a/.github/workflows/_precheck_publish.yml b/.github/workflows/_precheck_publish.yml
@@ -69,9 +69,7 @@ jobs:
           target-suffix: arm64
           arch: arm64
           bazel-extra: >-
-            --config=common-envoy-engflow
-            --config=cache-envoy-engflow
-            --config=bes-envoy-engflow
+            --config=remote-cache-envoy-engflow
           rbe: false
           runs-on: envoy-arm64-large
           timeout-minutes: 180

diff --git a/.github/workflows/_publish_build.yml b/.github/workflows/_publish_build.yml
@@ -76,9 +76,7 @@ jobs:
           name: Release (arm64)
           arch: arm64
           bazel-extra: >-
-            --config=cache-envoy-engflow
-            --config=common-envoy-engflow
-            --config=bes-envoy-engflow
+            --config=remote-cache-envoy-engflow
           rbe: false
           runs-on: envoy-arm64-medium
 
@@ -97,9 +95,7 @@ jobs:
     with:
       arch: ${{ matrix.arch }}
       bazel-extra: >-
-        --config=cache-envoy-engflow
-        --config=common-envoy-engflow
-        --config=bes-envoy-engflow
+        --config=remote-cache-envoy-engflow
       downloads: |
         release.${{ matrix.arch }}: release/${{ matrix.arch }}/bin/
       target: ${{ matrix.target }}

diff --git a/.github/workflows/_publish_verify.yml b/.github/workflows/_publish_verify.yml
@@ -142,7 +142,5 @@ jobs:
           target: verify_distro
           arch: arm64
           bazel-extra: >-
-            --config=cache-envoy-engflow
-            --config=common-envoy-engflow
-            --config=bes-envoy-engflow
+            --config=remote-cache-envoy-engflow
           runs-on: envoy-arm64-small
diff --git a/.github/workflows/envoy-macos.yml b/.github/workflows/envoy-macos.yml
@@ -69,9 +69,7 @@ jobs:
             _BAZEL_BUILD_EXTRA_OPTIONS=(
               --remote_download_toplevel
               --flaky_test_attempts=2
-              --config=bes-envoy-engflow
-              --config=cache-envoy-engflow
-              --config=common-envoy-engflow
+              --config=remote-cache-envoy-engflow
               --config=ci)
             export BAZEL_BUILD_EXTRA_OPTIONS=${_BAZEL_BUILD_EXTRA_OPTIONS[*]}