diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c1d8967b10d86aee8d76a690d1ed0ab176fd613..ecb3ae2ee9b7d6b77f5c452f225320d0dc1a645c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,12 @@ .env: variables: - GHC_VERSION: "9.8.4" - CABAL_VERSION: "3.10.3.0" + GHC_VERSION: "9.10.1" + CABAL_VERSION: "3.12.1.0" STACK_VERSION: "3.1.1" HLS_VERSION: "2.10.0.0" BUILD_GHC: "true" BUILD_HLS: "false" - TAG_VERSION_MAJ_MIN: "true" + TAG_VERSION_MAJ_MIN: "false" TAG_VERSION_MAJ: "false" .before-script-build: &before-script-build diff --git a/latest.Dockerfile b/latest.Dockerfile index 4ecc97bbf126b6e2b625fcd19b6d50cc4018726c..a5b4566a630fb4fa1fa84aa9c7ae35ff413b17f1 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -5,8 +5,8 @@ ARG STACK_VERSION ARG GHC_VERSION_BUILD=${GHC_VERSION} ARG CABAL_VERSION_BUILD=${CABAL_VERSION} -FROM glcr.b-data.ch/ghc/ghc-musl:9.8.2-linux-amd64 AS bootstrap-amd64 -FROM glcr.b-data.ch/ghc/ghc-musl:9.8.2-linux-arm64v8 AS bootstrap-arm64 +FROM glcr.b-data.ch/ghc/ghc-musl:9.8.4-linux-amd64 AS bootstrap-amd64 +FROM glcr.b-data.ch/ghc/ghc-musl:9.8.4-linux-arm64v8 AS bootstrap-arm64 FROM glcr.b-data.ch/ghc/ghc-musl:9.8.2-linux-riscv64 AS bootstrap-riscv64 FROM bootstrap-${TARGETARCH}${TARGETVARIANT} AS bootstrap