summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-09-06 18:13:09 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-09-07 09:34:32 -0400
commitd4bc9f0de7992f60bce403731019829f6248cc2c (patch)
tree9c9664bc0c099e0bc61f1723ba7691da73a88e6b /.gitlab-ci.yml
parent10434d60c62fee7212f08bffde624702f81e93cf (diff)
downloadhaskell-d4bc9f0de7992f60bce403731019829f6248cc2c.tar.gz
gitlab-ci: Use hadrian builds for Windows release artifacts
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml18
1 files changed, 11 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db995ed797..1d8ec08803 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -856,13 +856,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
@@ -903,16 +906,17 @@ 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-make
+ extends: .build-x86_64-windows-hadrian
variables:
BUILD_FLAVOUR: "perf"
- #
+
release-x86_64-windows-integer-simple:
<<: *release
- extends: .build-x86_64-windows-make
+ extends: .build-x86_64-windows-hadrian
variables:
BIGNUM_BACKEND: native
BUILD_FLAVOUR: "perf"