From 871c21607a4c3b4ae7d06dc7a4f9fd4e9b8f5aef Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Mon, 13 May 2024 06:32:28 +0200
Subject: [PATCH] Rebuild GHC version 9.8.2
- Use GHC 9.6.5 for bootstrapping
---
.gitlab-ci.yml | 6 +++---
latest.Dockerfile | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 708a85b..df6151d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,12 @@
.env:
variables:
- GHC_VERSION: "9.6.5"
+ GHC_VERSION: "9.8.2"
CABAL_VERSION: "3.10.3.0"
STACK_VERSION: "2.15.5"
HLS_VERSION: "2.7.0.0"
BUILD_GHC: "true"
- BUILD_HLS: "true"
- TAG_VERSION_MAJ_MIN: "true"
+ BUILD_HLS: "false"
+ TAG_VERSION_MAJ_MIN: "false"
TAG_VERSION_MAJ: "false"
.before-script-build: &before-script-build
diff --git a/latest.Dockerfile b/latest.Dockerfile
index f590cdc..0b90abe 100644
--- a/latest.Dockerfile
+++ b/latest.Dockerfile
@@ -5,7 +5,7 @@ ARG STACK_VERSION
ARG GHC_VERSION_BUILD=${GHC_VERSION}
ARG CABAL_VERSION_BUILD=${CABAL_VERSION}
-FROM glcr.b-data.ch/ghc/ghc-musl:9.6.4 as bootstrap
+FROM glcr.b-data.ch/ghc/ghc-musl:9.6.5 as bootstrap
RUN apk upgrade --no-cache \
&& apk add --no-cache \
--
GitLab