Commit 7b2ecbc0 authored by Ben Gamari's avatar Ben Gamari 🐢 Committed by Marge Bot

gitlab-ci: Factor out Linux Hadrian validation logic

parent f868e1fe
...@@ -215,9 +215,8 @@ lint-release-changelogs: ...@@ -215,9 +215,8 @@ lint-release-changelogs:
- ghc.tar.xz - ghc.tar.xz
- junit.xml - junit.xml
validate-x86_64-linux-deb9-hadrian: .validate-linux-hadrian:
extends: .validate-hadrian extends: .validate-hadrian
stage: build
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV"
variables: variables:
TEST_ENV: "x86_64-linux-deb9-hadrian" TEST_ENV: "x86_64-linux-deb9-hadrian"
...@@ -231,8 +230,12 @@ validate-x86_64-linux-deb9-hadrian: ...@@ -231,8 +230,12 @@ validate-x86_64-linux-deb9-hadrian:
tags: tags:
- x86_64-linux - x86_64-linux
validate-x86_64-linux-deb9-hadrian:
extends: .validate-linux-hadrian
stage: build
validate-x86_64-linux-deb9-unreg-hadrian: validate-x86_64-linux-deb9-unreg-hadrian:
extends: validate-x86_64-linux-deb9-hadrian extends: .validate-linux-hadrian
stage: full-build stage: full-build
variables: variables:
CONFIGURE_ARGS: --enable-unregisterised CONFIGURE_ARGS: --enable-unregisterised
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment