summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorWander Hillen <wjw.hillen@gmail.com>2020-09-13 22:37:56 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-09-14 17:46:54 -0400
commita5ffb39afc386729c821b924dd2c6a93917e1b5f (patch)
tree7ac1564e832cc7b7eb2f7e3e6e9048afd968e80e /.gitlab-ci.yml
parent5ae8212c3d2f284bc18a562625be3f4640984497 (diff)
downloadhaskell-a5ffb39afc386729c821b924dd2c6a93917e1b5f.tar.gz
Move ahead cabal cache restoration to before use of cabal
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65cdcc2926..34df8e23bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -258,11 +258,10 @@ hadrian-ghc-in-ghci:
tags:
- x86_64-linux
script:
+ - .gitlab/ci.sh setup
- cabal update
- cd hadrian; cabal new-build --with-compiler=$GHC --project-file=ci.project; cd ..
- git clean -xdf && git submodule foreach git clean -xdf
- - .gitlab/ci.sh setup
- - if [[ -d ./cabal-cache ]]; then cp -R ./.cabal-cache ~/.cabal-cache; fi
- ./boot
- ./configure $CONFIGURE_ARGS
# Load ghc-in-ghci then immediately exit and check the modules loaded