diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6470ad8ac3c3ba2c0e3ef9126bf647dc03ef1831..8986471426085cffec146f2aadf56080e7c583cc 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 @@ -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: diff --git a/latest.Dockerfile b/latest.Dockerfile index e246837cb6a323a13e570f17b09560e97065a16d..f0d05315cd3a4ce2fccdf17a6ecf954627e3e1f7 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