[commit: ghc] master: gitlab-ci: Set thread count properly on Windows (46c575a)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/46c575a8b6221def3fd9b8b932d95930a448446f/ghc

>---------------------------------------------------------------

commit 46c575a8b6221def3fd9b8b932d95930a448446f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 21 10:10:09 2018 -0500

    gitlab-ci: Set thread count properly on Windows


>---------------------------------------------------------------

46c575a8b6221def3fd9b8b932d95930a448446f
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6f6a93..da3c209 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