From 9a76e9d7f24897ba88a7677943c07d24beb6d7c2 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Mon, 3 Jan 2022 14:30:52 +0100
Subject: [PATCH] Rebuild GHC version 9.2.1
- Use GHC 9.0.2 for bootstrapping
---
.gitlab-ci.yml | 7 -------
latest.Dockerfile | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9246ce..524630f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,13 +160,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 12d5b59..839ad21 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.0.1 as bootstrap
+FROM registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.2 as bootstrap
COPY patches/* /tmp/
--
GitLab