From dfc3fe1a7a60394f08290ceba24ba02dc5efe9b3 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Tue, 15 Aug 2023 13:19:22 +0200
Subject: [PATCH] Rebuild GHC v9.6.2; Add package shadow
---
.gitlab-ci.yml | 11 ++---------
latest.Dockerfile | 1 +
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a42611..e0ed22a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,8 +35,8 @@
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
BUILDX_NO_DEFAULT_ATTESTATIONS: "true"
- GHC_VERSION_BUILD: "9.4.6"
- 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"
before_script:
- *before-script-build
@@ -201,13 +201,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: $CI_COMMIT_BRANCH == "freeze-version"
changes:
diff --git a/latest.Dockerfile b/latest.Dockerfile
index 8f916b7..a0c5fa8 100644
--- a/latest.Dockerfile
+++ b/latest.Dockerfile
@@ -90,6 +90,7 @@ RUN apk add --no-cache \
pcre-dev \
pcre2 \
pcre2-dev \
+ shadow \
perl \
wget \
xz \
--
GitLab