diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-12-21 10:10:09 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-12-21 16:54:40 -0500 |
| commit | 46c575a8b6221def3fd9b8b932d95930a448446f (patch) | |
| tree | 82a2e37734fe9966b70d4813d7543e164ece2194 /.gitlab-ci.yml | |
| parent | 4cb59c19ffbda68283327fa2a3fc1232fb4cfd97 (diff) | |
| download | haskell-46c575a8b6221def3fd9b8b932d95930a448446f.tar.gz | |
gitlab-ci: Set thread count properly on Windows
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6f6a93cd2..da3c20944a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -298,7 +298,7 @@ validate-x86_64-windows-hadrian: # FIXME: --no-lint due to #15950 - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh -j`mk/detect-cpu-count.sh` --flavour=Quick --no-lint" - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh binary-dist" - - bash -c 'make V=0 test THREADS=$THREADS JUNIT_FILE=../../junit.xml' + - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' - cp -Rf $APPDATA/cabal cabal-cache cache: key: x86_64-windows @@ -316,7 +316,7 @@ validate-x86_64-windows: python boot bash -c './configure --with-ghc=`pwd`/toolchain/bin/ghc --enable-tarballs-autodownload HappyCmd=`pwd`/toolchain/bin/happy AlexCmd=`pwd`/toolchain/bin/alex' - bash -c "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`" - - bash -c 'make V=0 test THREADS=$THREADS JUNIT_FILE=../../junit.xml' + - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml' - cp -Rf $APPDATA/cabal cabal-cache cache: key: x86_64-windows |