diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-09-06 18:13:09 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-09-17 19:46:29 -0400 |
| commit | 4e00ee7b9c1da4ee687673309a154c9718437473 (patch) | |
| tree | f503d1f5267c36761d79088ac5a386423b0b26d4 | |
| parent | 3309d2a2700a5c4d197bcd14b4fc47d19dce6962 (diff) | |
| download | haskell-4e00ee7b9c1da4ee687673309a154c9718437473.tar.gz | |
gitlab-ci: Use hadrian builds for Windows release artifacts
(cherry picked from commit d4bc9f0de7992f60bce403731019829f6248cc2c)
| -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 b25d8bcb88..fb4bb398a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -826,13 +826,16 @@ validate-x86_64-linux-fedora27: - ghc.tar.xz - junit.xml -validate-x86_64-windows-hadrian: +.build-x86_64-windows-hadrian: extends: .build-windows-hadrian variables: MSYSTEM: MINGW64 - TEST_ENV: "x86_64-windows-hadrian" + TEST_ENV: "x86_64-windows" cache: - key: "x86_64-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION" + key: "x86_64-windows-$WINDOWS_TOOLCHAIN_VERSION" + +validate-x86_64-windows-hadrian: + extends: .build-x86_64-windows-hadrian .build-windows-make: extends: .build-windows @@ -873,13 +876,14 @@ nightly-x86_64-windows: variables: BUILD_FLAVOUR: "validate" -# Normal Windows validate builds are profiled; that won't do for releases. +# Normal Windows validate builds lack profiled libraries; that won't do for +# releases. release-x86_64-windows: <<: *release extends: .build-x86_64-windows-hadrian variables: BUILD_FLAVOUR: "perf" - # + release-x86_64-windows-integer-simple: <<: *release extends: .build-x86_64-windows-hadrian |