diff --git a/.devcontainer/VERSION_MATRIX.md b/.devcontainer/VERSION_MATRIX.md index d4c84d5fd8f5af1675efb1a35b2f016b09478fe5..6c78398292ca25c4fafbb920ceaab8eac6ccf896 100644 --- a/.devcontainer/VERSION_MATRIX.md +++ b/.devcontainer/VERSION_MATRIX.md @@ -4,7 +4,8 @@ | GHC | Cabal[^1] | Stack[^1] | HLS | |:----------------------------|:----------|:------------|:------------------------------------------------------------------------- | -| latest<br>9.8.1<br>9.8<br>9 | 3.10.2.1 | ≥ 2.13.1 | latest<br>2.6.0.0<br>2.5.0.0<br>2.4.0.0 | +| latest<br>9.8.2<br>9.8<br>9 | 3.10.2.1 | ≥ 2.13.1 | latest<br>2.6.0.0 | +| 9.8.1 | 3.10.2.1 | ≥ 2.13.1 | latest<br>2.6.0.0<br>2.5.0.0<br>2.4.0.0 | | 9.6.4<br>9.6 | 3.10.1.0 | ≥ 2.13.1 | 2.6.0.0 | | 9.6.3 | 3.10.1.0 | ≥ 2.13.1 | 2.5.0.0<br>2.4.0.0<br>2.3.0.0<br>2.2.0.0 | | 9.4.8<br>9.4 | 3.8.1.0 | ≥ 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 d331d4d139abe43065c929498e86f411ed194303..de3fc788b285e3ca11033f1691de5c35a84013fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,11 @@ .env: variables: - GHC_VERSION: "9.8.1" + GHC_VERSION: "9.8.2" CABAL_VERSION: "3.10.2.1" STACK_VERSION: "2.15.1" HLS_VERSION: "2.6.0.0" BUILD_GHC: "true" - BUILD_HLS: "false" + BUILD_HLS: "true" TAG_VERSION_MAJ_MIN: "false" TAG_VERSION_MAJ: "false" diff --git a/README.md b/README.md index b43a1dab7e6695df1d00a73ac9bfc8a3370eddc9..56904ed1f21a04a7cb59d142558933088a6c494f 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ To install docker, follow the instructions for your platform: ```bash docker build \ - --build-arg GHC_VERSION=9.8.1 \ + --build-arg GHC_VERSION=9.8.2 \ --build-arg CABAL_VERSION=3.10.2.1 \ --build-arg STACK_VERSION=2.15.1 \ -t ghc-musl \ diff --git a/VERSION_MATRIX.md b/VERSION_MATRIX.md index 0783480b7b0ba55d1be2f1a4e7b2b6ff79422a55..7dd2b468bdd640132e1f2f43eefd1aa0e8e9ddca 100644 --- a/VERSION_MATRIX.md +++ b/VERSION_MATRIX.md @@ -4,6 +4,7 @@ Topmost entry = Tag `latest` | GHC | Cabal | Stack | LLVM | Linux distro | |:-----------|:---------|:-----------|:---- |:-------------| +| 9.8.2 | 3.10.2.1 | 2.15.1 | 14 | Alpine 3.19 | | 9.8.1 | 3.10.2.1 | 2.15.1 | 14 | Alpine 3.19 | | 9.6.4 | 3.10.1.0 | 2.15.1 | 14 | Alpine 3.19 | | 9.6.3 | 3.10.1.0 | 2.13.1 | 14 | Alpine 3.19 | diff --git a/latest.Dockerfile b/latest.Dockerfile index 9ef16f6f602e3aca9b4fbf90abf098605df415ad..f590cdc8eef08a209a3e0628b34c6312c6312de3 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -36,9 +36,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 FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD || \ + --receive-keys 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 || \ gpg --keyserver hkp://keyserver.ubuntu.com:80 \ - --receive-keys FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD \ + --receive-keys 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 \ && 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" \