diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0c213b35f57735b59fa226e24661e13bc686c50..7c3e1286d7aa06d3feda70c348499d08185db4af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,12 @@ .env: variables: - GHC_VERSION: "9.8.3" - 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.9.0.1" 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..a9f4cb4fd481344309e6b4c18586aa6e762bcf90 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.3-linux-amd64 AS bootstrap-amd64 +FROM glcr.b-data.ch/ghc/ghc-musl:9.8.3-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