Skip to content

Commit 124c6c4

Browse files
committed
CI: Use --with-bzlmod flag with start script
Skip running the start script with bzlmod passing `--use-nix` as it currently is not supported.
1 parent 03ff85c commit 124c6c4

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.github/workflows/workflow.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ jobs:
104104
nix-shell --arg docTools false --argstr ghcVersion ${{ matrix.ghc }} --pure --run '
105105
set -euo pipefail
106106
cd rules_haskell_tests
107-
./tests/run-start-script.sh --use-nix
107+
# XXX run start script `--with-bzlmod=true` when supported
108+
if ! ${{ matrix.bzlmod }}; then
109+
./tests/run-start-script.sh --use-nix --with-bzlmod=${{ matrix.bzlmod }}
110+
fi
108111
bazel build //tests:run-tests
109112
./bazel-ci-bin/tests/run-tests
110113
bazel coverage //...
@@ -218,7 +221,7 @@ jobs:
218221
run: |
219222
cd rules_haskell_tests
220223
[[ ${{ runner.os }} == macOS ]] && export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
221-
./tests/run-start-script.sh --use-bindists
224+
./tests/run-start-script.sh --use-bindists --with-bzlmod=${{ matrix.bzlmod }}
222225
if [[ ${{ runner.os }} == Windows ]]; then
223226
# prevent auto-detection of system compilers
224227
export BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1

0 commit comments

Comments
 (0)