diff --git a/.devcontainer/VERSION_MATRIX.md b/.devcontainer/VERSION_MATRIX.md index 98701cb99b1054d7a2a1a0f8f6897b5104d3bd36..e235107515f0a873f042970d2869a8ddcd75c6bb 100644 --- a/.devcontainer/VERSION_MATRIX.md +++ b/.devcontainer/VERSION_MATRIX.md @@ -4,7 +4,7 @@ | GHC | Cabal[^1] | Stack[^1] | HLS | |:------------------------------|:----------|:----------|:------------------------------ | -| latest<br>9.12.1<br>9.12<br>9 | 3.14.1.0 | ≥ 2.13.1 | n/a | +| latest<br>9.12.2<br>9.12<br>9 | 3.14.1.1 | ≥ 2.13.1 | n/a | | 9.10.1<br>9.10 | 3.12.1.0 | ≥ 2.13.1 | 2.10.0.0<br>2.9.0.1<br>2.9.0.0 | | 9.8.4<br>9.8 | 3.10.3.0 | ≥ 2.13.1 | 2.10.0.0 | | 9.6.6<br>9.6 | 3.10.3.0 | ≥ 2.13.1 | 2.10.0.0<br>2.9.0.1 | @@ -15,6 +15,7 @@ | GHC | Cabal[^1] | Stack[^1] | HLS | |:-------------|:----------|:----------|:----------------------------------------------------------------------------------------------- | +| 9.12.1 | 3.14.1.0 | ≥ 2.13.1 | n/a | | 9.8.3 | 3.10.3.0 | ≥ 2.13.1 | 2.10.0.0 | | 9.8.2 | 3.10.3.0 | ≥ 2.13.1 | 2.9.0.1<br>2.9.0.0<br>2.8.0.0<br>2.7.0.0<br>2.6.0.0 | | 9.8.1 | 3.10.2.1 | ≥ 2.13.1 | 2.6.0.0<br>2.5.0.0<br>2.4.0.0 | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e7316ddf0ab965d1f0041770ef95d0b49b4049a..dbca171b142101a1a7fccf1943bbc7ccbb9c3d43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ .env: variables: - GHC_VERSION: "9.12.1" - CABAL_VERSION: "3.14.1.0" + GHC_VERSION: "9.12.2" + CABAL_VERSION: "3.14.1.1" STACK_VERSION: "3.3.1" HLS_VERSION: "2.10.0.0" BUILD_GHC: "true" diff --git a/README.md b/README.md index 2f99fdb1ea2f70dce4b5e5d3be8a4abe4b58c6aa..36a255d1166c92e33e0f90f0388a35abc91edb08 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,8 @@ To install docker, follow the instructions for your platform: ```bash docker build \ - --build-arg GHC_VERSION=9.12.1 \ - --build-arg CABAL_VERSION=3.14.1.0 \ + --build-arg GHC_VERSION=9.12.2 \ + --build-arg CABAL_VERSION=3.14.1.1 \ --build-arg STACK_VERSION=3.3.1 \ -t ghc-musl \ -f latest.Dockerfile . diff --git a/VERSION_MATRIX.md b/VERSION_MATRIX.md index a4e33c581f3a9ae0cf915051dd40c19ec06bf9d7..fbe77a6902fee5533d55d71f46ea80669d02bfc0 100644 --- a/VERSION_MATRIX.md +++ b/VERSION_MATRIX.md @@ -4,6 +4,7 @@ Topmost entry = Tag `latest` | GHC | Cabal | Stack | LLVM | Linux distro | |:-----------|:---------|:-----------|:---- |:-------------| +| 9.12.2 | 3.14.1.1 | 3.3.1 | 18 | Alpine 3.21 | | 9.12.1 | 3.14.1.0 | 3.3.1 | 18 | Alpine 3.21 | | 9.10.1 | 3.12.1.0 | 3.3.1 | 18 | Alpine 3.21 | | 9.8.4 | 3.10.3.0 | 3.3.1 | 16 | Alpine 3.21 | diff --git a/latest.Dockerfile b/latest.Dockerfile index cf937f0b08608f4b512603fca2ee6ea03b5d47a0..de5f321a2eb7554eeee2a5374c715173abc681ad 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -41,9 +41,9 @@ RUN cd /tmp \ && curl -sSLO https://downloads.haskell.org/~ghc/"$GHC_VERSION"/ghc-"$GHC_VERSION"-src.tar.xz \ && curl -sSLO https://downloads.haskell.org/~ghc/"$GHC_VERSION"/ghc-"$GHC_VERSION"-src.tar.xz.sig \ && gpg --keyserver hkps://keyserver.ubuntu.com:443 \ - --receive-keys 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 || \ + --receive-keys FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD || \ gpg --keyserver hkp://keyserver.ubuntu.com:80 \ - --receive-keys 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 \ + --receive-keys FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD \ && gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \ && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \ && cd "ghc-$GHC_VERSION" \ @@ -168,7 +168,7 @@ COPY --from=bootstrap-cabal /root/.local/bin/cabal /usr/local/bin/cabal ## Rebuild Cabal (the tool) with the GHC target version RUN cabal update \ - && cabal install --allow-newer "cabal-install-$CABAL_VERSION" + && cabal install "cabal-install-$CABAL_VERSION" FROM ghc-stage1 AS test