diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-07-25 15:45:34 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-09-23 16:00:17 -0400 |
| commit | ca88d91c055d877412626f92973b1f896bcb8b79 (patch) | |
| tree | a61079da867b105b513d6777750a7ba84dd2e96e /.gitlab-ci.yml | |
| parent | aafda13d3746ca8185c89f2f3eca77470f09b746 (diff) | |
| download | haskell-ca88d91c055d877412626f92973b1f896bcb8b79.tar.gz | |
ci: Consolidate handling of cabal cache
Previously the cache persistence was implemented as various ad-hoc `cp`
commands at the end of the individual CI scripts. Here we move all of
this logic into `ci.sh`.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8930a2bbc3..942c11023f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -299,7 +299,7 @@ lint-release-changelogs: - git checkout .gitmodules - "git fetch https://gitlab.haskell.org/ghc/ghc-performance-notes.git refs/notes/perf:refs/notes/perf || true" after_script: - - cp -Rf $HOME/.cabal cabal-cache + - .gitlab/ci.sh save_cache - .gitlab/ci.sh clean tags: - x86_64-linux @@ -373,7 +373,7 @@ hadrian-ghc-in-ghci: # 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: - - cp -Rf $HOME/.cabal cabal-cache + - .gitlab/ci.sh save_cache cache: key: hadrian-ghci paths: @@ -398,7 +398,7 @@ hadrian-ghc-in-ghci: - git checkout .gitmodules - .gitlab/ci.sh setup after_script: - - cp -Rf $HOME/.cabal cabal-cache + - .gitlab/ci.sh save_cache variables: GHC_FLAGS: -Werror cache: @@ -492,7 +492,7 @@ lint-libs: TEST_ENV: "x86_64-freebsd" BUILD_FLAVOUR: "validate" after_script: - - cp -Rf $HOME/.cabal cabal-cache + - .gitlab/ci.sh save_cache - .gitlab/ci.sh clean artifacts: when: always @@ -531,7 +531,7 @@ release-x86_64-freebsd: TEST_ENV: "x86_64-freebsd-hadrian" BUILD_FLAVOUR: "validate" after_script: - - cp -Rf $HOME/.cabal cabal-cache + - .gitlab/ci.sh save_cache - .gitlab/ci.sh clean artifacts: when: always @@ -644,7 +644,7 @@ validate-x86_64-darwin: echo "Test took $TIME_TEST_DELTA seconds" # Important to run this in nix-shell because $HOME is different in there - runInNixShell ".gitlab/ci.sh save-cache" 2>&1 + runInNixShell ".gitlab/ci.sh save_cache" 2>&1 echo "=== TIMINGS ===" echo "Setup | $TIME_SETUP_DELTA" @@ -740,7 +740,7 @@ validate-aarch64-darwin: echo "Test took $TIME_TEST_DELTA seconds" # Important to run this in nix-shell because $HOME is different there - runInNixShell ".gitlab/ci.sh save-cache" 2>&1 + runInNixShell ".gitlab/ci.sh save_cache" 2>&1 echo "=== TIMINGS ===" echo "Setup | $TIME_SETUP_DELTA" @@ -1200,8 +1200,7 @@ release-x86_64-linux-fedora27-dwarf: # Setup toolchain - bash .gitlab/ci.sh setup after_script: - - | - Copy-Item -Recurse -Path $Env:APPDATA\cabal -Destination cabal-cache + - bash .gitlab/ci.sh save_cache - bash .gitlab/ci.sh clean dependencies: [] variables: |