diff options
author | Wander Hillen <wjw.hillen@gmail.com> | 2020-08-19 15:49:48 +0200 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-08-22 03:29:36 -0400 |
commit | 03cfcfd450335d5ecb63fec1f55d9feafabb2b4c (patch) | |
tree | bd04111938f777cc2136c6c363da9193230cf9cd | |
parent | e67ae884ebe42cb31fc4230301a5f555ae23cce8 (diff) | |
download | haskell-03cfcfd450335d5ecb63fec1f55d9feafabb2b4c.tar.gz |
Add ubuntu 20.04 jobs for nightly and release
-rw-r--r-- | .gitlab-ci.yml | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89f5e0c004..09c841bf5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: GIT_SSL_NO_VERIFY: "1" # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: 6223fe0b5942f4fa35bdec92c74566cf195bfb42 + DOCKER_REV: b65e1145d7c0a62c3533904a88dac14f56fb371b # Sequential version number capturing the versions of all tools fetched by # .gitlab/ci.sh. @@ -673,6 +673,35 @@ release-x86_64-linux-deb10: extends: .build-x86_64-linux-deb10 ################################# +# x86_64-linux-ubuntu 20.04 +################################# + +.build-x86_64-linux-ubuntu2004: + extends: .validate-linux + stage: full-build + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-ubuntu2004:$DOCKER_REV" + variables: + TEST_ENV: "x86_64-linux-ubuntu2004" + BIN_DIST_PREP_TAR_COMP: "./ghc-x86_64-ubuntu2004-linux.tar.xz" + cache: + key: linux-x86_64-ubuntu2004 + +# Disabled to alleviate CI load +.validate-x86_64-linux-ubuntu2004: + extends: .build-x86_64-linux-ubuntu2004 + stage: full-build + +nightly-x86_64-linux-ubuntu2004: + <<: *nightly + extends: .build-x86_64-linux-ubuntu2004 + variables: + TEST_TYPE: slowtest + +release-x86_64-linux-ubuntu2004: + <<: *release + extends: .build-x86_64-linux-ubuntu2004 + +################################# # x86_64-linux-deb8 ################################# |