From 508474b393bbb3218b0bb6cc46f193e2bcdde329 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Mon, 16 Dec 2024 12:01:15 +0100 Subject: [PATCH] Bump GHC 9.8.4 --- .github/workflows/debian.yml | 8 ++++---- 9.8/buster/Dockerfile | 8 ++++---- 9.8/slim-buster/Dockerfile | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 1e0014c..91efd18 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.10.1', '9.8.2', '9.6.6', '9.4.8', '9.2.8', '9.0.2' ] + ghc: ['9.10.1', '9.8.4', '9.6.6', '9.4.8', '9.2.8', '9.0.2' ] deb: ['buster', 'slim-buster'] include: - ghc: '9.10.1' @@ -35,7 +35,7 @@ jobs: deb: 'bullseye' - ghc: '9.10.1' ghc_minor: '9.10' - - ghc: '9.8.2' + - ghc: '9.8.4' ghc_minor: '9.8' - ghc: '9.6.6' ghc_minor: '9.6' @@ -77,7 +77,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.0.2', '9.2.8', '9.4.8', '9.6.6', '9.8.2', '9.10.1'] + ghc: ['9.0.2', '9.2.8', '9.4.8', '9.6.6', '9.8.4', '9.10.1'] # uraimo/run-on-arch-action does not support debian slim variants deb: ['buster'] arch: ['aarch64'] @@ -96,7 +96,7 @@ jobs: # buster (debian 10) - ghc: '9.10.1' ghc_minor: '9.10' - - ghc: '9.8.2' + - ghc: '9.8.4' ghc_minor: '9.8' - ghc: '9.6.6' ghc_minor: '9.6' diff --git a/9.8/buster/Dockerfile b/9.8/buster/Dockerfile index ff5e5ed..aa4ff68 100644 --- a/9.8/buster/Dockerfile +++ b/9.8/buster/Dockerfile @@ -80,8 +80,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC=9.8.2 -ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 +ARG GHC=9.8.4 +ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD 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='9a3776fd8dc02f95b751f0e44823d6727dea2c212857e2c5c5f6a38a034d1575'; \ + GHC_SHA256='15cf9341437af2c6f75bbaf8222824f5b51c32f0637ed054513f165999b0a87d'; \ ;; \ 'x86_64') \ - GHC_SHA256='7449e1c8ef351ec326f36d9eba2885ba7b75d9900df35b2069c4d6fd151b09eb'; \ + GHC_SHA256='26bc72eb2758a3df14a4a88193d116d2cf334c2a20892b401f5cd3f82e6d346c'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \ diff --git a/9.8/slim-buster/Dockerfile b/9.8/slim-buster/Dockerfile index 72eba6d..336556b 100644 --- a/9.8/slim-buster/Dockerfile +++ b/9.8/slim-buster/Dockerfile @@ -94,8 +94,8 @@ RUN set -eux; \ \ cabal --version -ARG GHC=9.8.2 -ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 +ARG GHC=9.8.4 +ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD 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='9a3776fd8dc02f95b751f0e44823d6727dea2c212857e2c5c5f6a38a034d1575'; \ + GHC_SHA256='15cf9341437af2c6f75bbaf8222824f5b51c32f0637ed054513f165999b0a87d'; \ ;; \ 'x86_64') \ - GHC_SHA256='7449e1c8ef351ec326f36d9eba2885ba7b75d9900df35b2069c4d6fd151b09eb'; \ + GHC_SHA256='26bc72eb2758a3df14a4a88193d116d2cf334c2a20892b401f5cd3f82e6d346c'; \ ;; \ *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \ esac; \