diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-12-09 23:52:56 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-12-11 03:56:27 -0500 |
| commit | 741309b94e5ef312f4112c86e99b540d412dd100 (patch) | |
| tree | 1d7f38c4ea0f3d8ca2847295e2d79cfd564ad712 /.gitlab-ci.yml | |
| parent | d3a24d3190de47044981363329337c16b5052028 (diff) | |
| download | haskell-741309b94e5ef312f4112c86e99b540d412dd100.tar.gz | |
gitlab-ci: Fix incorrect Docker image for nightly cross job
Also refactor the job definition to eliminate the bug by construction.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7aa6f66c73..a5203ace4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -257,27 +257,24 @@ validate-x86_64-linux-deb9-unreg-hadrian: CONFIGURE_ARGS: --enable-unregisterised TEST_ENV: "x86_64-linux-deb9-unreg-hadrian" -validate-x86_64-linux-deb10-hadrian-cross-aarch64: - <<: *nightly +.build-x86_64-linux-deb10-hadrian-cross-aarch64: extends: .validate-linux-hadrian - stage: full-build image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV" variables: BIN_DIST_NAME: "ghc-x86_64-deb9-linux" - rules: - - if: '$CI_MERGE_REQUEST_LABELS =~ /.*cross-compilation.*/' - variables: CONFIGURE_ARGS: --with-intree-gmp CROSS_TARGET: "aarch64-linux-gnu" +validate-x86_64-linux-deb10-hadrian-cross-aarch64: + extends: .build-x86_64-linux-deb10-hadrian-cross-aarch64 + stage: full-build + rules: + - if: '$CI_MERGE_REQUEST_LABELS =~ /.*cross-compilation.*/' + nightly-x86_64-linux-deb10-hadrian-cross-aarch64: <<: *nightly - extends: .validate-linux-hadrian + extends: .build-x86_64-linux-deb10-hadrian-cross-aarch64 stage: full-build - variables: - CONFIGURE_ARGS: --with-intree-gmp - CROSS_TARGET: "aarch64-linux-gnu" - ############################################################ |