summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2022-03-26 12:09:31 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-04-06 13:03:16 -0400
commit6563cd2473a309b135eb8f950adf28b9f3d8e5c2 (patch)
tree22eb3757856086434a9258fa64c5449708bae8c1 /.gitlab-ci.yml
parentc41c478eb9003eaa9fc8081a0039652448124f5d (diff)
downloadhaskell-6563cd2473a309b135eb8f950adf28b9f3d8e5c2.tar.gz
gitlab-ci: Bump bootstrap compiler to 9.2.2
This is necessary to build recent `text` commits. Bumps Hackage index state for a hashable which builds with GHC 9.2.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31e407eccb..c1ec3706dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,11 +2,11 @@ variables:
GIT_SSL_NO_VERIFY: "1"
# Commit of ghc/ci-images repository from which to pull Docker images
- DOCKER_REV: 885dfba7f74583d6a394dbf711cc805178cfcc47
+ DOCKER_REV: 0849567cd9780cc8e9652118b949cb050c632ef4
# Sequential version number of all cached things.
# Bump to invalidate GitLab CI cache.
- CACHE_REV: 6
+ CACHE_REV: 8
# Disable shallow clones; they break our linting rules
GIT_DEPTH: 0
@@ -342,7 +342,8 @@ stack-hadrian-build:
.build-x86_64-linux-deb10-make:
extends: .validate
- image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
+ # Sadly we cannot bootstrap the make build system with 9.2 due to #21188.
+ image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:885dfba7f74583d6a394dbf711cc805178cfcc47"
variables:
TEST_ENV: "x86_64-linux-deb10-make"
BUILD_FLAVOUR: "validate"