From 500296c28ad7987bb23dd696c4ef7dde80dafe3c Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Thu, 24 Aug 2023 06:33:17 +0200
Subject: [PATCH] Rebuild GHC version 9.6.2
- Use GHC 9.4.7 for bootstrapping
---
.gitlab-ci.yml | 18 ++----------------
VERSION_MATRIX.md | 1 +
latest.Dockerfile | 4 ++--
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19d9eb7..9056284 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
.env:
variables:
- GHC_VERSION_BUILD: "9.4.7"
- CABAL_VERSION_BUILD: "3.8.1.0"
+ GHC_VERSION_BUILD: "9.6.2"
+ CABAL_VERSION_BUILD: "3.10.1.0"
STACK_VERSION: "2.11.1"
HLS_VERSION: "2.1.0.0"
BUILD_GHC: "true"
@@ -223,13 +223,6 @@ build-manifest:version-linux-multiarch:
$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
fi
docker manifest push $CI_APP_REPO:$CI_APP_TAG
- - |
- docker manifest create $CI_APP_REPO:$VERSION_MAJ_MIN $CI_MANIFEST_LIST
- if echo $OS_ARCH | grep "linux-arm64v8" >/dev/null ; then
- docker manifest annotate --variant v8 $CI_APP_REPO:$VERSION_MAJ_MIN \
- $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
- fi
- docker manifest push $CI_APP_REPO:$VERSION_MAJ_MIN
rules:
- if: $BUILD_GHC == "true" && $CI_COMMIT_BRANCH == "freeze-version"
changes:
@@ -380,13 +373,6 @@ build-package-hls-manifest:version-linux-multiarch:
$CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8
fi
docker manifest push $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION
- - |
- docker manifest create $CI_APP_REPO/$VERSION_MAJ_MIN/hls:$HLS_VERSION $CI_MANIFEST_LIST
- if echo $OS_ARCH | grep "linux-arm64v8" >/dev/null ; then
- docker manifest annotate --variant v8 $CI_APP_REPO/$VERSION_MAJ_MIN/hls:$HLS_VERSION \
- $CI_APP_REPO/$CI_APP_TAG/hls:$HLS_VERSION-linux-arm64v8
- fi
- docker manifest push $CI_APP_REPO/$VERSION_MAJ_MIN/hls:$HLS_VERSION
rules:
- if: $BUILD_HLS == "true" && $CI_COMMIT_BRANCH == "freeze-version"
changes:
diff --git a/VERSION_MATRIX.md b/VERSION_MATRIX.md
index 22433a0..6dfe6ac 100644
--- a/VERSION_MATRIX.md
+++ b/VERSION_MATRIX.md
@@ -6,6 +6,7 @@ Topmost entry = Tag `latest`
|:-----------|:---------|:-----------|:---- |:-------------|
| 9.6.2 | 3.10.1.0 | 2.11.1[^1] | 14 | Alpine 3.18 |
| 9.6.1 | 3.10.1.0 | n/a | 14 | Alpine 3.18 |
+| 9.4.7 | 3.8.1.0 | 2.11.1[^1] | 14 | Alpine 3.18 |
| 9.4.6 | 3.8.1.0 | 2.11.1[^1] | 14 | Alpine 3.18 |
| 9.4.5 | 3.8.1.0 | n/a | 14 | Alpine 3.17 |
| 9.4.4 | 3.8.1.0 | n/a | 14 | Alpine 3.17 |
diff --git a/latest.Dockerfile b/latest.Dockerfile
index a0c5fa8..2c777f3 100644
--- a/latest.Dockerfile
+++ b/latest.Dockerfile
@@ -2,7 +2,7 @@ ARG GHC_VERSION_BUILD
ARG CABAL_VERSION_BUILD
ARG STACK_VERSION
-FROM glcr.b-data.ch/ghc/ghc-musl:9.4.6 as bootstrap
+FROM glcr.b-data.ch/ghc/ghc-musl:9.4.7 as bootstrap
ARG GHC_VERSION_BUILD
ARG CABAL_VERSION_BUILD
@@ -90,8 +90,8 @@ RUN apk add --no-cache \
pcre-dev \
pcre2 \
pcre2-dev \
- shadow \
perl \
+ shadow \
wget \
xz \
xz-dev \
--
GitLab