CI: Explicitly enable / disable bzlmod

Author: avdv

.github/workflows/workflow.yaml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-11]
         module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
-        bzlmod: [bzlmod, workspace]
+        bzlmod: [true, false]
         ghc:
           - 9.2.5
           - 9.4.5
@@ -62,16 +62,11 @@ jobs:
           else
               cache_setting="--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY"
           fi
-          if [ ${{ matrix.bzlmod }} == bzlmod ]; then
-              bzlmod_setting='common --config bzlmod'
-          else
-              bzlmod_setting=''
-          fi
           cat >.bazelrc.local <<EOF
           common --config=ci
           build --config=$BUILD_CONFIG
           build $cache_setting
-          $bzlmod_setting
+          common --enable_bzlmod=${{ matrix.bzlmod }}
           EOF
           cp .bazelrc.local rules_haskell_nix
           cp .bazelrc.local rules_haskell_tests
@@ -121,7 +116,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-11, windows-latest]
         module: [rules_haskell, rules_haskell_tests]
-        bzlmod: [bzlmod, workspace]
+        bzlmod: [true, false]
         ghc:
           - 9.2.5
           - 9.4.5
@@ -168,16 +163,15 @@ jobs:
           else
               cache_setting="--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY"
           fi
-          if [ ${{ matrix.bzlmod }} == bzlmod ]; then
-              bzlmod_setting='common --config bzlmod'
-          else
-              bzlmod_setting=''
-          fi
           if [[ ${{ runner.os }} == Windows ]]; then
               output_root_setting="startup --output_user_root=C:/_bzl"
               # On windows, we use a separate remote cache for bzlmod,
               # because the c dependency analysis is leaking absolute paths which are different
-              bzlmod_cache_silo_key="build --remote_default_exec_properties=bzlmod-cache-silo-key=${{ matrix.bzlmod }}"
+              if ${{ matrix.bzlmod }}; then
+                bzlmod_cache_silo_key='build --remote_default_exec_properties=bzlmod-cache-silo-key=bzlmod'
+              else
+                bzlmod_cache_silo_key='build --remote_default_exec_properties=bzlmod-cache-silo-key=workspace'
+              fi
           else
               output_root_setting=""
               bzlmod_cache_silo_key=""
@@ -188,7 +182,7 @@ jobs:
           build $cache_setting
           $output_root_setting
           $bzlmod_cache_silo_key
-          $bzlmod_setting
+          common --enable_bzlmod=${{ matrix.bzlmod }}
           EOF
           cp .bazelrc.local rules_haskell_tests
           cat >~/.netrc <<EOF