summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2021-05-29 13:21:18 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-06-02 16:23:53 -0400
commit852a12c82830f25b2d7db5a4ab9d098c71203905 (patch)
tree8b0a4f30b4817a446c5e8d3ef8b31ce2b0433d00
parentde33143cb0e38a91bd866470d5d4da9e91ee79f3 (diff)
downloadhaskell-852a12c82830f25b2d7db5a4ab9d098c71203905.tar.gz
CI: Don't explicitly build hadrian before using run_hadrian
This causes hadrian to be built twice because the second time uses a different index state.
-rw-r--r--.gitlab-ci.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9722ea0cb6..3e0db17aa4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -326,7 +326,6 @@ hadrian-ghc-in-ghci:
- .gitlab/ci.sh setup
- "cabal update --index=$HACKAGE_INDEX_STATE"
- .gitlab/ci.sh configure
- - cd hadrian; cabal new-build -j`../mk/detect-cpu-count.sh` --with-compiler=$GHC --project-file=ci.project; cd ..
# 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,"
after_script:
@@ -355,7 +354,6 @@ hadrian-ghc-in-ghci:
- git checkout .gitmodules
- .gitlab/ci.sh setup
- "cabal update --index=$HACKAGE_INDEX_STATE"
- - cd hadrian; cabal new-build -j`../mk/detect-cpu-count.sh` --with-compiler=$GHC --project-file=ci.project; cd ..
after_script:
- cp -Rf $HOME/.cabal cabal-cache
variables: