From 3298faebff05b2c3e8e4582a0aa808b4e592d521 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Thu, 25 May 2023 19:24:04 +0200
Subject: [PATCH] Update GHC to v9.6.2
---
.gitlab-ci.yml | 2 +-
latest.Dockerfile | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43f69a9..8585b55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
BUILDX_NO_DEFAULT_ATTESTATIONS: "true"
- GHC_VERSION_BUILD: "9.6.1"
+ GHC_VERSION_BUILD: "9.6.2"
CABAL_VERSION_BUILD: "3.10.1.0"
before_script:
- *before-script-build
diff --git a/latest.Dockerfile b/latest.Dockerfile
index 23baee6..a5b666c 100644
--- a/latest.Dockerfile
+++ b/latest.Dockerfile
@@ -52,7 +52,7 @@ RUN cd /tmp \
# See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history
&& cabal install --allow-newer --constraint 'Cabal-syntax<3.11' cabal-install-$CABAL_VERSION
-FROM alpine:3.17 as builder
+FROM alpine:3.18 as builder
LABEL org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.source="https://gitlab.b-data.ch/ghc/ghc-musl" \
@@ -81,7 +81,7 @@ RUN apk upgrade --no-cache \
libcurl \
libffi \
libffi-dev \
- llvm14 \
+ llvm16 \
ncurses-dev \
ncurses-static \
openssl-dev \
--
GitLab