Skip to content

Commit e7f56b0

Browse files
authored
feat: bump ghc 9.6 to 9.6.7 (#152)
* feat: bump ghc 9.6 to 9.6.7 * Fix buster checksums
1 parent 32ea631 commit e7f56b0

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

Diff for: .github/workflows/debian.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
ghc: ['9.12.2', '9.10.1', '9.8.4', '9.6.6', '9.4.8', '9.2.8', '9.0.2']
29+
ghc: ['9.12.2', '9.10.1', '9.8.4', '9.6.7', '9.4.8', '9.2.8', '9.0.2']
3030
deb: ['buster', 'slim-buster']
3131
include:
3232
- ghc: '9.12.2'
@@ -51,13 +51,13 @@ jobs:
5151
deb: 'bullseye'
5252
- ghc: '9.8.4'
5353
ghc_minor: '9.8'
54-
- ghc: '9.6.6'
54+
- ghc: '9.6.7'
5555
ghc_minor: '9.6'
5656
deb: 'slim-bullseye'
57-
- ghc: '9.6.6'
57+
- ghc: '9.6.7'
5858
ghc_minor: '9.6'
5959
deb: 'bullseye'
60-
- ghc: '9.6.6'
60+
- ghc: '9.6.7'
6161
ghc_minor: '9.6'
6262
- ghc: '9.4.8'
6363
ghc_minor: '9.4'
@@ -96,7 +96,7 @@ jobs:
9696
strategy:
9797
fail-fast: false
9898
matrix:
99-
ghc: ['9.0.2', '9.2.8', '9.4.8', '9.6.6', '9.8.4', '9.10.1', '9.12.2']
99+
ghc: ['9.0.2', '9.2.8', '9.4.8', '9.6.7', '9.8.4', '9.10.1', '9.12.2']
100100
# uraimo/run-on-arch-action does not support debian slim variants
101101
deb: ['buster']
102102
arch: ['aarch64']
@@ -118,7 +118,7 @@ jobs:
118118
deb: 'bullseye'
119119
arch: 'aarch64'
120120
docker_platform: arm64
121-
- ghc: '9.6.6'
121+
- ghc: '9.6.7'
122122
ghc_minor: '9.6'
123123
deb: 'bullseye'
124124
arch: 'aarch64'
@@ -128,7 +128,7 @@ jobs:
128128
ghc_minor: '9.10'
129129
- ghc: '9.8.4'
130130
ghc_minor: '9.8'
131-
- ghc: '9.6.6'
131+
- ghc: '9.6.7'
132132
ghc_minor: '9.6'
133133
- ghc: '9.4.8'
134134
ghc_minor: '9.4'

Diff for: 9.6/bullseye/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -94,23 +94,23 @@ RUN set -eux; \
9494
\
9595
cabal --version
9696

97-
ARG GHC=9.6.6
98-
ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
97+
ARG GHC=9.6.7
98+
ARG GHC_RELEASE_KEY=8C961469C8FDC968718D6245AC7DE836C5DF907D
9999

100100
RUN set -eux; \
101101
cd /tmp; \
102102
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
103103
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
104104
case "$ARCH" in \
105105
'aarch64') \
106-
# Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.6/
106+
# Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.7/
107107
# But deb10 (buster) images should be binary compatible with deb11, so using deb10 instead
108108
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb10-linux.tar.xz"; \
109-
GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
109+
GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \
110110
;; \
111111
'x86_64') \
112112
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
113-
GHC_SHA256='a34bdfc1f65b000135d9c8eb12d69670026a64043a8b33ef5ba24b0f8e28d046'; \
113+
GHC_SHA256='fc6a6247d1831745c67b27d6212f6911c35a933043f3b6851724e2e01484d077'; \
114114
;; \
115115
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
116116
esac; \

Diff for: 9.6/buster/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ RUN set -eux; \
8080
\
8181
cabal --version
8282

83-
ARG GHC=9.6.6
84-
ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
83+
ARG GHC=9.6.7
84+
ARG GHC_RELEASE_KEY=8C961469C8FDC968718D6245AC7DE836C5DF907D
8585

8686
RUN set -eux; \
8787
cd /tmp; \
@@ -90,10 +90,10 @@ RUN set -eux; \
9090
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
9191
case "$ARCH" in \
9292
'aarch64') \
93-
GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
93+
GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \
9494
;; \
9595
'x86_64') \
96-
GHC_SHA256='15ee68cede5d114a672fb468b9545700edd70a68724ab4e9122c8a23aba8570b'; \
96+
GHC_SHA256='a9ba017398fe683a8b87060dcf5bde81e2437d83ca8c41add0dbdceebd0a28ce'; \
9797
;; \
9898
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
9999
esac; \

Diff for: 9.6/slim-bullseye/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -94,23 +94,23 @@ RUN set -eux; \
9494
\
9595
cabal --version
9696

97-
ARG GHC=9.6.6
98-
ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
97+
ARG GHC=9.6.7
98+
ARG GHC_RELEASE_KEY=8C961469C8FDC968718D6245AC7DE836C5DF907D
9999

100100
RUN set -eux; \
101101
cd /tmp; \
102102
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
103103
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
104104
case "$ARCH" in \
105105
'aarch64') \
106-
# Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.6/
106+
# Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.7/
107107
# But deb10 (buster) images should be binary compatible with deb11, so using deb10 instead
108108
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb10-linux.tar.xz"; \
109-
GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
109+
GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \
110110
;; \
111111
'x86_64') \
112112
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
113-
GHC_SHA256='a34bdfc1f65b000135d9c8eb12d69670026a64043a8b33ef5ba24b0f8e28d046'; \
113+
GHC_SHA256='fc6a6247d1831745c67b27d6212f6911c35a933043f3b6851724e2e01484d077'; \
114114
;; \
115115
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
116116
esac; \

Diff for: 9.6/slim-buster/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ RUN set -eux; \
9494
\
9595
cabal --version
9696

97-
ARG GHC=9.6.6
98-
ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
97+
ARG GHC=9.6.7
98+
ARG GHC_RELEASE_KEY=8C961469C8FDC968718D6245AC7DE836C5DF907D
9999

100100
RUN set -eux; \
101101
cd /tmp; \
@@ -104,10 +104,10 @@ RUN set -eux; \
104104
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
105105
case "$ARCH" in \
106106
'aarch64') \
107-
GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
107+
GHC_SHA256='3cfa843687856de304a946dbe849a497c4fdad021f0275628b8ca7b55ccf8082'; \
108108
;; \
109109
'x86_64') \
110-
GHC_SHA256='15ee68cede5d114a672fb468b9545700edd70a68724ab4e9122c8a23aba8570b'; \
110+
GHC_SHA256='a9ba017398fe683a8b87060dcf5bde81e2437d83ca8c41add0dbdceebd0a28ce'; \
111111
;; \
112112
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
113113
esac; \

0 commit comments

Comments
 (0)