Merge branch 'main' of github.com:mvukov/rules_ros2 into set-bazel-te…

…st-env-for-ros2-cpp-test
mvukov · Apr 29, 2023 · 8362e00 · 8362e00
2 parents 802be17 + 0d9d567
commit 8362e00
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/ci.bazelrc b/.github/workflows/ci.bazelrc
@@ -7,18 +7,18 @@ build --announce_rc
 build --repository_cache=~/.cache/bazel-repo
 
 # Set up remote cache.
-build --bes_results_url=https://app.buildbuddy.io/invocation/
-build --bes_backend=grpcs://remote.buildbuddy.io
-build --remote_cache=grpcs://remote.buildbuddy.io
-build --remote_timeout=3600
-build --remote_download_toplevel
-build --experimental_remote_cache_compression
+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:remote --remote_download_toplevel
+build:remote --experimental_remote_cache_compression
 
 # buildbuddy suggestions:
-build --experimental_profile_include_primary_output
-build --experimental_profile_include_target_label
-build --experimental_remote_build_event_upload=minimal
-build --noslim_profile
+build:remote --experimental_profile_include_primary_output
+build:remote --experimental_profile_include_target_label
+build:remote --experimental_remote_build_event_upload=minimal
+build:remote --noslim_profile
 
 # Don't spam CI logs.
 build --show_progress_rate_limit=60

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -79,8 +79,14 @@ jobs:
         env:
           # Bazelisk will download bazel to here, ensure it is cached between runs.
           XDG_CACHE_HOME: ~/.cache/bazel-repo
+          BUILDBUDDY_ORG_API_KEY: ${{ secrets.BUILDBUDDY_ORG_API_KEY }}
         working-directory: ${{ matrix.folder }}
         run: |
+          if [[ ! -z "${BUILDBUDDY_ORG_API_KEY}" ]]; then
+            BAZEL_REMOTE_CONFIG=(
+              --config=remote
+              --remote_header=x-buildbuddy-api-key="${BUILDBUDDY_ORG_API_KEY}"
+            )
+          fi
           bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc --bazelrc=.bazelrc \
-              test ${{ matrix.config_option }} //... \
-              --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_ORG_API_KEY }}
+              test "${BAZEL_REMOTE_CONFIG[@]}" ${{ matrix.config_option }} //...