From 234e2d1322412e5386e35a0b7221c89a038fdf67 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Thu, 5 Dec 2024 07:31:58 +0100
Subject: [PATCH] Rebuild GHC version 9.10.1
- Use GHC 9.8.4 for bootstrapping
---
.gitlab-ci.yml | 6 +++---
latest.Dockerfile | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c1d896..ecb3ae2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,12 @@
.env:
variables:
- GHC_VERSION: "9.8.4"
- CABAL_VERSION: "3.10.3.0"
+ GHC_VERSION: "9.10.1"
+ CABAL_VERSION: "3.12.1.0"
STACK_VERSION: "3.1.1"
HLS_VERSION: "2.10.0.0"
BUILD_GHC: "true"
BUILD_HLS: "false"
- TAG_VERSION_MAJ_MIN: "true"
+ TAG_VERSION_MAJ_MIN: "false"
TAG_VERSION_MAJ: "false"
.before-script-build: &before-script-build
diff --git a/latest.Dockerfile b/latest.Dockerfile
index 4ecc97b..a5b4566 100644
--- a/latest.Dockerfile
+++ b/latest.Dockerfile
@@ -5,8 +5,8 @@ ARG STACK_VERSION
ARG GHC_VERSION_BUILD=${GHC_VERSION}
ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
-FROM glcr.b-data.ch/ghc/ghc-musl:9.8.2-linux-amd64 AS bootstrap-amd64
-FROM glcr.b-data.ch/ghc/ghc-musl:9.8.2-linux-arm64v8 AS bootstrap-arm64
+FROM glcr.b-data.ch/ghc/ghc-musl:9.8.4-linux-amd64 AS bootstrap-amd64
+FROM glcr.b-data.ch/ghc/ghc-musl:9.8.4-linux-arm64v8 AS bootstrap-arm64
FROM glcr.b-data.ch/ghc/ghc-musl:9.8.2-linux-riscv64 AS bootstrap-riscv64
FROM bootstrap-${TARGETARCH}${TARGETVARIANT} AS bootstrap
--
GitLab