diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-09-18 14:00:02 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-09-22 17:05:52 -0400 |
| commit | d4d44edbe4f9acbd523b3cc049f9a6ac3f7f0ddd (patch) | |
| tree | 0cd9ad3b6c6689848763fc534b1f29f2cdba5678 /.gitlab | |
| parent | 17740c20e4c8e78add9e425910ac6546ffaeba03 (diff) | |
| download | haskell-d4d44edbe4f9acbd523b3cc049f9a6ac3f7f0ddd.tar.gz | |
gitlab-ci: Ensure that cabal-install overwrites existing executables
Previously cabal-install wouldn't overwrite toolchain executables if
they already existed (as they likely would due to caching).
(cherry picked from commit 2f7ef2fb3234cdfb89b3da1298fc9c1b7381e418)
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 095043149d..102f18bada 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -282,7 +282,12 @@ function fetch_cabal() { function setup_toolchain() { fetch_ghc fetch_cabal - cabal_install="$CABAL v2-install --index-state=$hackage_index_state --installdir=$toolchain/bin" + + cabal_install="$CABAL v2-install \ + --index-state=$hackage_index_state \ + --installdir=$toolchain/bin \ + --overwrite-policy=always" + # Avoid symlinks on Windows case "$(uname)" in MSYS_*|MINGW*) cabal_install="$cabal_install --install-method=copy" ;; |