Skip to content
Snippets Groups Projects
Verified Commit da1d58b9 authored by Olivier Benz's avatar Olivier Benz
Browse files

Merge branch 'main' into freeze-version

parents 77fefec7 87b8bdde
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -114,7 +114,6 @@ build:version-linux-arm64v8:
build-manifest:latest-linux-multiarch:
extends: .build
stage: deploy
needs: ["build:latest-linux-amd64", "build:latest-linux-arm64v8"]
script:
- |
......@@ -156,7 +155,6 @@ build-manifest:latest-linux-multiarch:
build-manifest:version-linux-multiarch:
extends: .build
stage: deploy
needs: ["build:version-linux-amd64", "build:version-linux-arm64v8"]
script:
- |
......@@ -170,13 +168,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:
......
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment