summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-08-24 16:17:34 -0400
committerBen Gamari <ben@smart-cactus.org>2020-08-24 16:28:08 -0400
commitff0d5a17c4b2c86ce0ab90fce8a92ab8d16cf9e5 (patch)
tree0a22426292c910a7c532cddd479f0d9198459b22
parentfe7ea93039673c1724d741abb5642d76e57063d8 (diff)
downloadhaskell-wip/windows-fixes.tar.gz
gitlab-ci: Drop Windows make jobwip/windows-fixes
These are a significant burden on our CI resources and end up failing quite often due to #18274. Here I drop the make jobs during validaion; it is now run only during the nightly builds.
-rw-r--r--.gitlab-ci.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af548be8e9..b406f7f9de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -866,9 +866,6 @@ validate-x86_64-windows-hadrian:
cache:
key: "x86_64-windows-$WINDOWS_TOOLCHAIN_VERSION"
-validate-x86_64-windows:
- extends: .build-x86_64-windows-make
-
nightly-x86_64-windows:
<<: *nightly
extends: .build-x86_64-windows-make
@@ -879,13 +876,13 @@ nightly-x86_64-windows:
# Normal Windows validate builds are profiled; that won't do for releases.
release-x86_64-windows:
<<: *release
- extends: validate-x86_64-windows
+ extends: .build-x86_64-windows-make
variables:
BUILD_FLAVOUR: "perf"
#
release-x86_64-windows-integer-simple:
<<: *release
- extends: validate-x86_64-windows
+ extends: .build-x86_64-windows-make
variables:
BIGNUM_BACKEND: native
BUILD_FLAVOUR: "perf"