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-09-17 19:46:29 -0400
commitcb8610b8db946466bec00dc0d684ad73e5760133 (patch)
treeee3ddc8519240aac7f6ede3ab2a32f75706717ca
parentb83682c7391a8f9cdc31af1992c73cad7a20c00c (diff)
downloadhaskell-cb8610b8db946466bec00dc0d684ad73e5760133.tar.gz
gitlab-ci: Drop Windows make job
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. (cherry picked from commit 72036e1c03385aa4f5ed70179ab4b154beed81cb)
-rw-r--r--.gitlab-ci.yml11
1 files changed, 4 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcf49d7c25..a5f85cee36 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-hadrian
+ extends: .build-x86_64-windows-hadrian
variables:
BUILD_FLAVOUR: "perf"
-
+ #
release-x86_64-windows-integer-simple:
<<: *release
- extends: validate-x86_64-windows-hadrian
+ extends: .build-x86_64-windows-hadrian
variables:
BIGNUM_BACKEND: native
BUILD_FLAVOUR: "perf"
@@ -940,7 +937,7 @@ doc-tarball:
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
dependencies:
- validate-x86_64-linux-deb9-debug
- - validate-x86_64-windows
+ - validate-x86_64-windows-hadrian
variables:
LINUX_BINDIST: "ghc-x86_64-deb9-linux-debug.tar.xz"
WINDOWS_BINDIST: "ghc-x86_64-mingw32.tar.xz"