Skip to content

Commit 6e90cc9

Browse files
committed
fix non-POSIX [[ ]]
Otherwise CI prints `validate.sh: 332: [[: not found` and the line does nothing (but `validate.sh` continues to run), unless the system shell is `ksh` / `bash` / `zsh`. This may explain #10114 (comment). (cherry picked from commit 0b5cf15)
1 parent ef670f2 commit 6e90cc9

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

validate.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,13 @@ CABAL_TESTSUITE_BDIR="$(pwd)/$BUILDDIR/build/$ARCH/$BASEHC/cabal-testsuite-3"
324324
CABALNEWBUILD="${CABAL} build $JOBS -w $HC --builddir=$BUILDDIR --project-file=$PROJECTFILE"
325325
CABALLISTBIN="${CABAL} list-bin --builddir=$BUILDDIR --project-file=$PROJECTFILE"
326326

327+
# This was needed in some local Windows MSYS2 environments
328+
# but breaks CI for Windows + GHC 9.0.2, thus it is set only on non-CI executions
329+
# of validate.sh
330+
# https://github.com/haskell/cabal/issues/9571
331+
# https://github.com/haskell/cabal/pull/10114
332+
RTSOPTS="$([ $ARCH = "x86_64-windows" ] && [ -z "$CI" ] && echo "+RTS --io-manager=native" || echo "")"
333+
327334
# header
328335
#######################################################################
329336

0 commit comments

Comments
 (0)