[Git][ghc/ghc][wip/ci-fixes] gitlab-ci: Fix incorrect Docker image for nightly cross job
Ben Gamari
gitlab at gitlab.haskell.org
Thu Dec 10 04:54:48 UTC 2020
Ben Gamari pushed to branch wip/ci-fixes at Glasgow Haskell Compiler / GHC
Commits:
354fb946 by Ben Gamari at 2020-12-09T23:54:40-05:00
gitlab-ci: Fix incorrect Docker image for nightly cross job
Also refactor the job definition to eliminate the bug by construction.
- - - - -
1 changed file:
- .gitlab-ci.yml
Changes:
=====================================
.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"
-
############################################################
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/354fb9462bd8f12143a48ce477338136c55b3133
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/354fb9462bd8f12143a48ce477338136c55b3133
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201209/be9663b8/attachment-0001.html>
More information about the ghc-commits
mailing list