summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-10-22 09:32:16 -0400
committerBen Gamari <ben@smart-cactus.org>2019-10-27 10:05:33 -0400
commit61f48e85230cf5b9f6e71a9114693f152fb4f011 (patch)
tree6c2d8ca023010b463ec21913fabdbffbae31b71b
parent20c25db2b90c281dbdc026e871363953218fdc52 (diff)
downloadhaskell-61f48e85230cf5b9f6e71a9114693f152fb4f011.tar.gz
gitlab-ci: Factor out Linux Hadrian validation logic
-rw-r--r--.gitlab-ci.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21d91bd4d8..c59688cac5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -215,9 +215,8 @@ lint-release-changelogs:
- ghc.tar.xz
- junit.xml
-validate-x86_64-linux-deb9-hadrian:
+.validate-linux-hadrian:
extends: .validate-hadrian
- stage: build
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
variables:
TEST_ENV: "x86_64-linux-deb9-hadrian"
@@ -231,8 +230,12 @@ validate-x86_64-linux-deb9-hadrian:
tags:
- x86_64-linux
+validate-x86_64-linux-deb9-hadrian:
+ extends: .validate-linux-hadrian
+ stage: build
+
validate-x86_64-linux-deb9-unreg-hadrian:
- extends: validate-x86_64-linux-deb9-hadrian
+ extends: .validate-linux-hadrian
stage: full-build
variables:
CONFIGURE_ARGS: --enable-unregisterised