summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-08-24 16:17:34 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-09-05 14:51:27 -0400
commit9fbaee212ff527c3a91c350c7e54c75c1484d778 (patch)
tree029bdc23bfd8e2732457d70ce99c98688232fb32
parentbec0d1701673a80d9517acabf559738613ba4e9c (diff)
downloadhaskell-9fbaee212ff527c3a91c350c7e54c75c1484d778.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.
-rw-r--r--.gitlab-ci.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c0a272fbf..1f1f7805f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -896,9 +896,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
@@ -909,13 +906,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"
@@ -970,7 +967,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"