diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ca56647266dd51a62d3918c0b6ac77daafef31b..0dcb1ac73cd457a375762fd94165f3769b769c92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -366,7 +366,8 @@ hadrian-ghc-in-ghci: - .gitlab/ci.sh setup - .gitlab/ci.sh configure # Load ghc-in-ghci then immediately exit and check the modules loaded - - echo ":q" | hadrian/ghci -j`mk/detect-cpu-count.sh`| tail -n2 | grep "Ok," + - export CORES="$(mk/detect-cpu-count.sh)" + - echo ":q" | HADRIAN_ARGS=-j$CORES hadrian/ghci -j$CORES | tail -n2 | grep "Ok," after_script: - .gitlab/ci.sh save_cache - cat ci-timings @@ -417,8 +418,9 @@ hadrian-multi: - .gitlab/ci.sh configure # Now GHC means, use this GHC for hadrian - export GHC=$BOOT_HC + - export CORES="$(mk/detect-cpu-count.sh)" # Load hadrian-multi then immediately exit and check the modules loaded - - echo ":q" | hadrian/ghci-multi -j`mk/detect-cpu-count.sh`| tail -n2 | grep "Ok," + - echo ":q" | HADRIAN_ARGS=-j$CORES hadrian/ghci-multi -j$CORES | tail -n2 | grep "Ok," after_script: - .gitlab/ci.sh save_cache cache: