From ab37be2a658362aad9b20e8a9255869fd49699de Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Thu, 10 Nov 2022 13:46:31 +0100
Subject: [PATCH] Rebuild GHC version 9.4.3

- Use GHC 9.2.5 for bootstrapping
---
 .gitlab-ci.yml    | 11 ++---------
 latest.Dockerfile |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6470ad8..c1eaf7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,8 +33,8 @@
   variables:
     DOCKER_DRIVER: overlay2
     DOCKER_TLS_CERTDIR: "/certs"
-    GHC_VERSION_BUILD: "9.2.5"
-    CABAL_VERSION_BUILD: "3.6.2.0"
+    GHC_VERSION_BUILD: "9.4.3"
+    CABAL_VERSION_BUILD: "3.8.1.0"
   before_script:
     - *before-script-build
 
@@ -170,13 +170,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 e246837..f0d0531 100644
--- a/latest.Dockerfile
+++ b/latest.Dockerfile
@@ -1,7 +1,7 @@
 ARG GHC_VERSION_BUILD
 ARG CABAL_VERSION_BUILD
 
-FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.2.4 as bootstrap
+FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.2.5 as bootstrap
 
 ARG GHC_VERSION_BUILD
 ARG CABAL_VERSION_BUILD
-- 
GitLab