regenerate

.bazelrc-buildbuddy

@@ -1,19 +1,27 @@
-build:remote --bes_results_url=https://app.buildbuddy.io/invocation/
-build:remote --bes_backend=grpcs://remote.buildbuddy.io
-build:remote --remote_cache=grpcs://remote.buildbuddy.io
-build:remote --remote_timeout=3600
+
+
+# Build Buddy Cache Setup
+build:build_buddy --bes_results_url=https://app.buildbuddy.io/invocation/
+build:build_buddy --bes_backend=grpcs://remote.buildbuddy.io
+build:build_buddy --remote_cache=grpcs://remote.buildbuddy.io
+build:build_buddy --remote_timeout=3600
 
 # Additional suggestions from buildbuddy for speed
-build:remote --experimental_remote_cache_compression
-build:remote --experimental_remote_cache_compression_threshold=100
-build:remote --noslim_profile
-build:remote --experimental_profile_include_target_label
-build:remote --experimental_profile_include_primary_output
-build:remote --nolegacy_important_outputs
+build:build_buddy --experimental_remote_cache_compression
+build:build_buddy --experimental_remote_cache_compression_threshold=100
+build:build_buddy --noslim_profile
+build:build_buddy --experimental_profile_include_target_label
+build:build_buddy --experimental_profile_include_primary_output
+build:build_buddy --nolegacy_important_outputs
 
-build --experimental_inmemory_jdeps_files
-build --experimental_inmemory_dotd_files
+build:build_buddy_readonly --config=build_buddy
+build:build_buddy_readonly --noremote_upload_local_results
 
-build:ci --config=remote
-build:ci --build_metadata=ROLE=CI
+# This config should be used locally. It downloads more than the CI version
+build:remote_user --config=build_buddy
+build:remote_user --config=build_buddy_readonly
+build:remote_user --remote_download_toplevel
+
+build:ci --config=build_buddy
 build:ci --remote_download_minimal
+build:ci --build_metadata=ROLE=CI

.github/actions/setup-build-buddy/action.yml

@@ -15,7 +15,8 @@ runs:
       shell: bash
       run: |
           echo "No API key secret detected, will setup readonly cache"
-          echo "build:ci --config=build_buddy_readonly" > bazel_auth.rc
+          echo "build:ci --config=build_buddy_readonly" > .buildbuddy-auth.rc
+          echo "build:ci --config=build_buddy_readonly"" > tests/.buildbuddy-auth.rc
 
     - name: Set with key
       env:
@@ -24,4 +25,5 @@ runs:
       shell: bash
       run: |
           echo "API Key detected!"
-          echo "build:build_buddy --remote_header=x-buildbuddy-api-key=${{ env.API_KEY }}" > bazel_auth.rc
+          echo "build:build_buddy --remote_header=x-buildbuddy-api-key=${{ env.API_KEY }}" > .buildbuddy-auth.rc
+          echo "build:build_buddy --remote_header=x-buildbuddy-api-key=${{ env.API_KEY }}" > tests/.buildbuddy-auth.rc

.github/workflows/build.yml

@@ -150,7 +150,6 @@ jobs:
       uses: ./.github/actions/setup-build-buddy
       with:
         token: ${{ secrets.BUILDBUDDY_API_KEY }}
-        readonly_token: ${{ secrets.BUILDBUDDY_READONLY }}
     - name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
       run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci || true
       working-directory: tests

tests/.bazelrc-buildbuddy

@@ -1,19 +1,27 @@
-build:remote --bes_results_url=https://app.buildbuddy.io/invocation/
-build:remote --bes_backend=grpcs://remote.buildbuddy.io
-build:remote --remote_cache=grpcs://remote.buildbuddy.io
-build:remote --remote_timeout=3600
+
+
+# Build Buddy Cache Setup
+build:build_buddy --bes_results_url=https://app.buildbuddy.io/invocation/
+build:build_buddy --bes_backend=grpcs://remote.buildbuddy.io
+build:build_buddy --remote_cache=grpcs://remote.buildbuddy.io
+build:build_buddy --remote_timeout=3600
 
 # Additional suggestions from buildbuddy for speed
-build:remote --experimental_remote_cache_compression
-build:remote --experimental_remote_cache_compression_threshold=100
-build:remote --noslim_profile
-build:remote --experimental_profile_include_target_label
-build:remote --experimental_profile_include_primary_output
-build:remote --nolegacy_important_outputs
+build:build_buddy --experimental_remote_cache_compression
+build:build_buddy --experimental_remote_cache_compression_threshold=100
+build:build_buddy --noslim_profile
+build:build_buddy --experimental_profile_include_target_label
+build:build_buddy --experimental_profile_include_primary_output
+build:build_buddy --nolegacy_important_outputs
 
-build --experimental_inmemory_jdeps_files
-build --experimental_inmemory_dotd_files
+build:build_buddy_readonly --config=build_buddy
+build:build_buddy_readonly --noremote_upload_local_results
 
-build:ci --config=remote
-build:ci --build_metadata=ROLE=CI
+# This config should be used locally. It downloads more than the CI version
+build:remote_user --config=build_buddy
+build:remote_user --config=build_buddy_readonly
+build:remote_user --remote_download_toplevel
+
+build:ci --config=build_buddy
 build:ci --remote_download_minimal
+build:ci --build_metadata=ROLE=CI