diff options
author | Ben Gamari <ben@smart-cactus.org> | 2019-10-22 09:32:16 -0400 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-29 03:48:20 -0400 |
commit | 7b2ecbc01aacbbacbbf8a02a0d6913e228f2994b (patch) | |
tree | ed8a0dae1be817b8d2aa86be7640bb61af257436 | |
parent | f868e1fe2964c8611beca69eae24f4ad6b385d36 (diff) | |
download | haskell-7b2ecbc01aacbbacbbf8a02a0d6913e228f2994b.tar.gz |
gitlab-ci: Factor out Linux Hadrian validation logic
-rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62b7a5f744..0d938fa396 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 |