Regenerate

wpilibsuite · Sep 25, 2024 · 0de3f6e · 0de3f6e
1 parent bbfe1b6
commit 0de3f6e
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 46 deletions.
diff --git a/.bazelrc-buildbuddy b/.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
diff --git a/.github/actions/setup-build-buddy/action.yml b/.github/actions/setup-build-buddy/action.yml
@@ -4,26 +4,19 @@ description: 'Sets up the build buddy cache to be readonly / writing based on th
 inputs:
   token:
     description: 'Build Buddy API token'
-  readonly_token:
-    description: 'Build Buddy API readonly token'
-    required: true
 
 runs:
   using: "composite"
   steps:
     - name: Setup without key
       env:
         API_KEY: ${{ inputs.token }}
-        READONLY_KEY: ${{ inputs.readonly_token }}
       if: ${{ env.API_KEY == '' }}
       shell: bash
       run: |
           echo "No API key secret detected, will setup readonly cache"
-          echo "build:ci --noremote_upload_local_results" > .buildbuddy-auth.rc
-          echo "build:ci --remote_header=x-buildbuddy-api-key=${{ env.READONLY_KEY }}" >> .buildbuddy-auth.rc
-
-          echo "build:ci --noremote_upload_local_results" > tests/.buildbuddy-auth.rc
-          echo "build:ci --remote_header=x-buildbuddy-api-key=${{ env.READONLY_KEY }}" >> tests/.buildbuddy-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:
@@ -32,5 +25,5 @@ runs:
       shell: bash
       run: |
           echo "API Key detected!"
-          echo "build:ci --remote_header=x-buildbuddy-api-key=${{ env.API_KEY }}" > .buildbuddy-auth.rc
-          echo "build:ci --remote_header=x-buildbuddy-api-key=${{ env.API_KEY }}" > tests/.buildbuddy-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
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,7 +38,6 @@ jobs:
       uses: ./.github/actions/setup-build-buddy
       with:
         token: ${{ secrets.BUILDBUDDY_API_KEY }}
-        readonly_token: ${{ secrets.BUILDBUDDY_READONLY }}
     - run: bazel ${{ matrix.bazel_options }} build -k ${{ matrix.config }} --config=ci @bzlmodrio-ni//...
       working-directory: tests
     - name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
@@ -78,7 +77,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
@@ -115,7 +113,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
@@ -153,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

diff --git a/tests/.bazelrc-buildbuddy b/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
diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel
@@ -19,9 +19,9 @@ bazel_dep(name = "rules_spotless", version = "2.40.0")
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
     artifacts = [
-        "org.junit.jupiter:junit-jupiter-api:5.8.2",
-        "org.junit.jupiter:junit-jupiter-params:5.8.2",
-        "org.junit.jupiter:junit-jupiter-engine:5.8.2",
+        "org.junit.jupiter:junit-jupiter-api:5.10.1",
+        "org.junit.jupiter:junit-jupiter-params:5.10.1",
+        "org.junit.jupiter:junit-jupiter-engine:5.10.1",
         "org.junit.platform:junit-platform-commons:1.6.1",
         "org.junit.platform:junit-platform-console:1.6.1",
         "org.junit.platform:junit-platform-engine:1.6.1",