diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-04-08 15:03:16 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-04-09 12:56:38 -0400 |
| commit | 9acdc4c0ea14f890045e973dabcb5ad3bb029505 (patch) | |
| tree | e043061e292e31a9c7a928649cf4212a9f86eb5b /.gitlab-ci.yml | |
| parent | fe40ddd9f960d89fbb430962f642ee9b053a0492 (diff) | |
| download | haskell-9acdc4c0ea14f890045e973dabcb5ad3bb029505.tar.gz | |
gitlab: Bump cabal-install version used by Windows builds to 2.4
Hopefully fixes Windows Hadrian build.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8fb5005955..414f8d07e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,10 @@ variables: # Commit of ghc/ci-images repository from which to pull Docker images DOCKER_REV: cefaee3c742af193e0f7783f87edb0d35374515c + # Sequential version number capturing the versions of all tools fetched by + # .gitlab/win32-init.sh. + WINDOWS_TOOLCHAIN_VERSION: 1 + before_script: - python3 .gitlab/fix-submodules.py - git submodule sync --recursive @@ -525,7 +529,7 @@ validate-x86_64-windows-hadrian: variables: MSYSTEM: MINGW64 cache: - key: x86_64-windows-hadrian + key: "x86_64-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION" nightly-i386-windows-hadrian: extends: .build-windows-hadrian @@ -535,7 +539,7 @@ nightly-i386-windows-hadrian: variables: - $NIGHTLY cache: - key: i386-windows-hadrian + key: "i386-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION" .build-windows-make: extends: .build-windows @@ -571,7 +575,7 @@ validate-x86_64-windows: MSYSTEM: MINGW64 CONFIGURE_ARGS: "--target=x86_64-unknown-mingw32" cache: - key: x86_64-windows + key: "x86_64-windows-$WINDOWS_TOOLCHAIN_VERSION" # Normal Windows validate builds are profiled; that won't do for releases. release-x86_64-windows: @@ -592,7 +596,7 @@ release-i386-windows: BUILD_FLAVOUR: "perf" CONFIGURE_ARGS: "--target=i386-unknown-mingw32" cache: - key: i386-windows + key: "i386-windows-$WINDOWS_TOOLCHAIN_VERSION" nightly-i386-windows: extends: .build-windows-make @@ -603,7 +607,7 @@ nightly-i386-windows: MSYSTEM: MINGW32 CONFIGURE_ARGS: "--target=i386-unknown-mingw32" cache: - key: i386-windows + key: "i386-windows-$WINDOWS_TOOLCHAIN_VERSION" ############################################################ # Cleanup |