fix: Revert configurebb.sh, use straight flags for bzlmod

Author: blorente

.github/workflows/configure_bazelrc.sh .github/workflows/configurebb.sh.github/workflows/configure_bazelrc.sh renamed to .github/workflows/configurebb.sh

@@ -1,17 +1,11 @@
 #!/bin/bash
 set -o errexit -o nounset -o pipefail
 
-touch "$HOME/.bazelrc"
-chmod 0600 "$HOME/.bazelrc"
-
-# Configure flags for bzlmod
-echo "common:bzlmod --enable_bzlmod" >> "$HOME/.bazelrc"
-echo "common:workspace --noenable_bzlmod" >> "$HOME/.bazelrc"
-
 if [ "${BUILDBUDDY_API_KEY:-}" ]; then
+  touch "$HOME/.bazelrc"
+  chmod 0600 "$HOME/.bazelrc"
   echo "build --bes_backend=grpcs://remote.buildbuddy.io"
   echo "build --bes_results_url=https://app.buildbuddy.io/invocation/"
   echo "build --remote_cache=grpcs://remote.buildbuddy.io"
-  echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" >> "$HOME/.bazelrc"
+  echo "build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" > "$HOME/.bazelrc"
 fi
-

.github/workflows/default.yaml

@@ -22,9 +22,9 @@ jobs:
         os:
           - ubuntu-22.04
           - ubuntu-24.04
-        bzlmod_config:
-          - bzlmod
-          - workspace
+        bzlmod:
+          - enabled: True
+          - enabled: False
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -37,8 +37,8 @@ jobs:
           repository-cache: true
       - name: Test
         run: |
-          ./.github/workflows/configure_bazelrc.sh
-          bazel test --config ci --config ${{ matrix.bzlmod_config }} //...
+          ./.github/workflows/configurebb.sh
+          bazel test --config ci --enable_bzlmod=${{ matrix.bzlmod.enabled }} //...
         env:
           BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
   compilation_modes:
@@ -48,9 +48,9 @@ jobs:
           - fastbuild
           - dbg
           - opt
-        bzlmod_config:
-          - bzlmod
-          - workspace
+        bzlmod:
+          - enabled: True
+          - enabled: False
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -63,8 +63,8 @@ jobs:
           repository-cache: true
       - name: Test
         run: |
-          ./.github/workflows/configure_bazelrc.sh
-          bazel test --config ci --config ${{ matrix.bzlmod_config }} --compilation_mode ${{ matrix.compilation_mode }} //...
+          ./.github/workflows/configurebb.sh
+          bazel test --config ci --enable_bzlmod=${{ matrix.bzlmod.enabled }} --compilation_mode ${{ matrix.compilation_mode }} //...
         env:
           BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
   sanitizers:
@@ -75,9 +75,9 @@ jobs:
           - lsan
           - tsan
           - ubsan
-        bzlmod_config:
-          - bzlmod
-          - workspace
+        bzlmod:
+          - enabled: True
+          - enabled: False
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -90,11 +90,16 @@ jobs:
           repository-cache: true
       - name: Test ${{ matrix.sanitizer }}
         run: |
-          ./.github/workflows/configure_bazelrc.sh
-          bazel test --config ci --config ${{ matrix.sanitizer }} --config ${{ matrix.bzlmod_config }} //tests/sanitizers:${{ matrix.sanitizer }}_test
+          ./.github/workflows/configurebb.sh
+          bazel test --config ci --config ${{ matrix.sanitizer }} --enable_bzlmod=${{ matrix.bzlmod.enabled }} //tests/sanitizers:${{ matrix.sanitizer }}_test
         env:
           BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
   coverage:
+    strategy:
+      matrix:
+        bzlmod:
+          - enabled: True
+          - enabled: False
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -107,8 +112,8 @@ jobs:
           repository-cache: true
       - name: Test Coverage
         run: |
-          ./.github/workflows/configure_bazelrc.sh
-          bazel coverage --config ci //examples/hello_world_cpp:hello_world_cpp_test
+          ./.github/workflows/configurebb.sh
+          bazel coverage --config ci --enable_bzlmod=${{ matrix.bzlmod.enabled }} //examples/hello_world_cpp:hello_world_cpp_test
         env:
           BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
   rbe:
@@ -117,9 +122,9 @@ jobs:
         os:
           - ubuntu-22.04
           - macos-14
-        bzlmod_config:
-          - bzlmod
-          - workspace
+        bzlmod:
+          - enabled: True
+          - enabled: False
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -132,7 +137,7 @@ jobs:
           repository-cache: true
       - name: Test with RBE
         run: |
-          ./.github/workflows/configure_bazelrc.sh
-          bazel test --config ci --config rbe --config ${{ matrix.bzlmod_config }} //...
+          ./.github/workflows/configurebb.sh
+          bazel test --config ci --config rbe --enable_bzlmod=${{ matrix.bzlmod.enabled }} //...
         env:
           BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}