From 6990bb5a2c6b111319a105fac7c4e2b6386b2140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Sun, 6 Apr 2025 07:40:27 +0200 Subject: [PATCH 1/2] feat: bump ghc 9.6 to 9.6.7 --- .github/workflows/debian.yml | 14 +++++++------- 9.6/bullseye/Dockerfile | 10 +++++----- 9.6/buster/Dockerfile | 8 ++++---- 9.6/slim-bullseye/Dockerfile | 10 +++++----- 9.6/slim-buster/Dockerfile | 8 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index a29c33e..59f31ec 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.12.2', '9.10.1', '9.8.4', '9.6.6', '9.4.8', '9.2.8', '9.0.2'] + ghc: ['9.12.2', '9.10.1', '9.8.4', '9.6.7', '9.4.8', '9.2.8', '9.0.2'] deb: ['buster', 'slim-buster'] include: - ghc: '9.12.2' @@ -51,13 +51,13 @@ jobs: deb: 'bullseye' - ghc: '9.8.4' ghc_minor: '9.8' - - ghc: '9.6.6' + - ghc: '9.6.7' ghc_minor: '9.6' deb: 'slim-bullseye' - - ghc: '9.6.6' + - ghc: '9.6.7' ghc_minor: '9.6' deb: 'bullseye' - - ghc: '9.6.6' + - ghc: '9.6.7' ghc_minor: '9.6' - ghc: '9.4.8' ghc_minor: '9.4' @@ -96,7 +96,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.0.2', '9.2.8', '9.4.8', '9.6.6', '9.8.4', '9.10.1', '9.12.2'] + ghc: ['9.0.2', '9.2.8', '9.4.8', '9.6.7', '9.8.4', '9.10.1', '9.12.2'] # uraimo/run-on-arch-action does not support debian slim variants deb: ['buster'] arch: ['aarch64'] @@ -118,7 +118,7 @@ jobs: deb: 'bullseye' arch: 'aarch64' docker_platform: arm64 - - ghc: '9.6.6' + - ghc: '9.6.7' ghc_minor: '9.6' deb: 'bullseye' arch: 'aarch64' @@ -128,7 +128,7 @@ jobs: ghc_minor: '9.10' - ghc: '9.8.4' ghc_minor: '9.8' - - ghc: '9.6.6' + - ghc: '9.6.7' ghc_minor: '9.6' - ghc: '9.4.8' ghc_minor: '9.4' diff --git a/9.6/bullseye/Dockerfile b/9.6/bullseye/Dockerfile index c0bdee3..911ed93 100644 --- a/9.6/bullseye/Dockerfile +++ b/9.6/bullseye/Dockerfile @@ -94,8 +94,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC=9.6.6 -ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 +ARG GHC=9.6.7 +ARG GHC_RELEASE_KEY=8C961469C8FDC968718D6245AC7DE836C5DF907D RUN set -eux; \ cd /tmp; \ @@ -103,14 +103,14 @@ RUN set -eux; \ # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS case "$ARCH" in \ 'aarch64') \ - # Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.6/ + # Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.7/ # But deb10 (buster) images should be binary compatible with deb11, so using deb10 instead GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb10-linux.tar.xz"; \ - GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \ + GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \ ;; \ 'x86_64') \ GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \ - GHC_SHA256='a34bdfc1f65b000135d9c8eb12d69670026a64043a8b33ef5ba24b0f8e28d046'; \ + GHC_SHA256='fc6a6247d1831745c67b27d6212f6911c35a933043f3b6851724e2e01484d077'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \ diff --git a/9.6/buster/Dockerfile b/9.6/buster/Dockerfile index b528292..ca20d6b 100644 --- a/9.6/buster/Dockerfile +++ b/9.6/buster/Dockerfile @@ -80,8 +80,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC=9.6.6 -ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 +ARG GHC=9.6.7 +ARG GHC_RELEASE_KEY=8C961469C8FDC968718D6245AC7DE836C5DF907D RUN set -eux; \ cd /tmp; \ @@ -90,10 +90,10 @@ RUN set -eux; \ # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS case "$ARCH" in \ 'aarch64') \ - GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \ + GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \ ;; \ 'x86_64') \ - GHC_SHA256='15ee68cede5d114a672fb468b9545700edd70a68724ab4e9122c8a23aba8570b'; \ + GHC_SHA256='fc6a6247d1831745c67b27d6212f6911c35a933043f3b6851724e2e01484d077'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \ diff --git a/9.6/slim-bullseye/Dockerfile b/9.6/slim-bullseye/Dockerfile index c4b3bb2..29aa470 100644 --- a/9.6/slim-bullseye/Dockerfile +++ b/9.6/slim-bullseye/Dockerfile @@ -94,8 +94,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC=9.6.6 -ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 +ARG GHC=9.6.7 +ARG GHC_RELEASE_KEY=8C961469C8FDC968718D6245AC7DE836C5DF907D RUN set -eux; \ cd /tmp; \ @@ -103,14 +103,14 @@ RUN set -eux; \ # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS case "$ARCH" in \ 'aarch64') \ - # Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.6/ + # Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.7/ # But deb10 (buster) images should be binary compatible with deb11, so using deb10 instead GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb10-linux.tar.xz"; \ - GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \ + GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \ ;; \ 'x86_64') \ GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \ - GHC_SHA256='a34bdfc1f65b000135d9c8eb12d69670026a64043a8b33ef5ba24b0f8e28d046'; \ + GHC_SHA256='fc6a6247d1831745c67b27d6212f6911c35a933043f3b6851724e2e01484d077'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \ diff --git a/9.6/slim-buster/Dockerfile b/9.6/slim-buster/Dockerfile index 92ccd62..d6a70ec 100644 --- a/9.6/slim-buster/Dockerfile +++ b/9.6/slim-buster/Dockerfile @@ -94,8 +94,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC=9.6.6 -ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 +ARG GHC=9.6.7 +ARG GHC_RELEASE_KEY=8C961469C8FDC968718D6245AC7DE836C5DF907D RUN set -eux; \ cd /tmp; \ @@ -104,10 +104,10 @@ RUN set -eux; \ # sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS case "$ARCH" in \ 'aarch64') \ - GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \ + GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \ ;; \ 'x86_64') \ - GHC_SHA256='15ee68cede5d114a672fb468b9545700edd70a68724ab4e9122c8a23aba8570b'; \ + GHC_SHA256='fc6a6247d1831745c67b27d6212f6911c35a933043f3b6851724e2e01484d077'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \ From fe002e3219b77f2ade77b689ccee915334ad002f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Mon, 7 Apr 2025 12:29:36 +0200 Subject: [PATCH 2/2] Fix buster checksums --- 9.6/buster/Dockerfile | 2 +- 9.6/slim-buster/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/9.6/buster/Dockerfile b/9.6/buster/Dockerfile index ca20d6b..1d6d764 100644 --- a/9.6/buster/Dockerfile +++ b/9.6/buster/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \ ;; \ 'x86_64') \ - GHC_SHA256='fc6a6247d1831745c67b27d6212f6911c35a933043f3b6851724e2e01484d077'; \ + GHC_SHA256='a9ba017398fe683a8b87060dcf5bde81e2437d83ca8c41add0dbdceebd0a28ce'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \ diff --git a/9.6/slim-buster/Dockerfile b/9.6/slim-buster/Dockerfile index d6a70ec..7db44f0 100644 --- a/9.6/slim-buster/Dockerfile +++ b/9.6/slim-buster/Dockerfile @@ -107,7 +107,7 @@ RUN set -eux; \ GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \ ;; \ 'x86_64') \ - GHC_SHA256='fc6a6247d1831745c67b27d6212f6911c35a933043f3b6851724e2e01484d077'; \ + GHC_SHA256='a9ba017398fe683a8b87060dcf5bde81e2437d83ca8c41add0dbdceebd0a28ce'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \