Skip to content

Commit 210996a

Browse files
authored
Merge pull request #67 from AlistairB/bumps
Bumps stack and GHC
2 parents 56d3f99 + ec98669 commit 210996a

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

.github/workflows/debian.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
ghc: ['8.10.7', '9.0.2', '9.2.1']
25+
ghc: ['8.10.7', '9.0.2', '9.2.2']
2626
deb: ['buster', 'slim-buster']
2727
include:
2828
- ghc: '8.10.7'
2929
ghc_minor: '8.10'
3030
- ghc: '9.0.2'
3131
ghc_minor: '9.0'
32-
- ghc: '9.2.1'
32+
- ghc: '9.2.2'
3333
ghc_minor: '9.2'
3434
steps:
3535
- uses: actions/checkout@v2
@@ -57,7 +57,7 @@ jobs:
5757
strategy:
5858
fail-fast: false
5959
matrix:
60-
ghc: ['8.10.7', '9.0.2', '9.2.1']
60+
ghc: ['8.10.7', '9.0.2', '9.2.2']
6161
# uraimo/run-on-arch-action does not support debian slim variants
6262
deb: ['buster']
6363
arch: ['aarch64']
@@ -66,7 +66,7 @@ jobs:
6666
ghc_minor: '8.10'
6767
- ghc: '9.0.2'
6868
ghc_minor: '9.0'
69-
- ghc: '9.2.1'
69+
- ghc: '9.2.2'
7070
ghc_minor: '9.2'
7171
- arch: aarch64
7272
docker_platform: arm64

8.10/buster/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -eux; \
116116
\
117117
"/opt/ghc/$GHC/bin/ghc" --version
118118

119-
ARG STACK=2.7.3
119+
ARG STACK=2.7.5
120120
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
121121

122122
RUN set -eux; \
@@ -133,7 +133,7 @@ RUN set -eux; \
133133
INSTALL_STACK="false"; \
134134
;; \
135135
'x86_64') \
136-
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
136+
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
137137
;; \
138138
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
139139
esac; \

8.10/slim-buster/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -eux; \
116116
\
117117
"/opt/ghc/$GHC/bin/ghc" --version
118118

119-
ARG STACK=2.7.3
119+
ARG STACK=2.7.5
120120
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
121121

122122
RUN set -eux; \
@@ -133,7 +133,7 @@ RUN set -eux; \
133133
INSTALL_STACK="false"; \
134134
;; \
135135
'x86_64') \
136-
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
136+
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
137137
;; \
138138
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
139139
esac; \

9.0/buster/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -eux; \
116116
\
117117
"/opt/ghc/$GHC/bin/ghc" --version
118118

119-
ARG STACK=2.7.3
119+
ARG STACK=2.7.5
120120
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
121121

122122
RUN set -eux; \
@@ -133,7 +133,7 @@ RUN set -eux; \
133133
INSTALL_STACK="false"; \
134134
;; \
135135
'x86_64') \
136-
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
136+
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
137137
;; \
138138
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
139139
esac; \

9.0/slim-buster/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ RUN set -eux; \
116116
\
117117
"/opt/ghc/$GHC/bin/ghc" --version
118118

119-
ARG STACK=2.7.3
119+
ARG STACK=2.7.5
120120
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
121121

122122
RUN set -eux; \
@@ -133,7 +133,7 @@ RUN set -eux; \
133133
INSTALL_STACK="false"; \
134134
;; \
135135
'x86_64') \
136-
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
136+
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
137137
;; \
138138
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
139139
esac; \

9.2/buster/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN set -eux; \
6262
\
6363
cabal --version
6464

65-
ARG GHC=9.2.1
65+
ARG GHC=9.2.2
6666
ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
6767

6868
RUN set -eux; \
@@ -72,10 +72,10 @@ RUN set -eux; \
7272
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
7373
case "$ARCH" in \
7474
'aarch64') \
75-
GHC_SHA256='717d4246a8b407a807048ce6eddb2785aca2e4c73b6b634c01e1726f42d539a1'; \
75+
GHC_SHA256='f3621ccba7ae48fcd67a9505f61bb5ccfb05c4cbfecd5a6ea65fe3f150af0e98'; \
7676
;; \
7777
'x86_64') \
78-
GHC_SHA256='53f1650ed092230480ff5750b94f409e5dfe66bd07ced00bbbcdf5d6b180234c'; \
78+
GHC_SHA256='fb61dea556a2023dc2d50ee61a22144bb23e4229a378e533065124c218f40cfc'; \
7979
;; \
8080
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
8181
esac; \
@@ -99,7 +99,7 @@ RUN set -eux; \
9999
\
100100
"/opt/ghc/$GHC/bin/ghc" --version
101101

102-
ARG STACK=2.7.3
102+
ARG STACK=2.7.5
103103
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
104104

105105
RUN set -eux; \
@@ -116,7 +116,7 @@ RUN set -eux; \
116116
INSTALL_STACK="false"; \
117117
;; \
118118
'x86_64') \
119-
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
119+
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
120120
;; \
121121
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
122122
esac; \

9.2/slim-buster/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ RUN set -eux; \
6060
\
6161
cabal --version
6262

63-
ARG GHC=9.2.1
63+
ARG GHC=9.2.2
6464
ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
6565

6666
RUN set -eux; \
@@ -70,10 +70,10 @@ RUN set -eux; \
7070
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
7171
case "$ARCH" in \
7272
'aarch64') \
73-
GHC_SHA256='717d4246a8b407a807048ce6eddb2785aca2e4c73b6b634c01e1726f42d539a1'; \
73+
GHC_SHA256='f3621ccba7ae48fcd67a9505f61bb5ccfb05c4cbfecd5a6ea65fe3f150af0e98'; \
7474
;; \
7575
'x86_64') \
76-
GHC_SHA256='53f1650ed092230480ff5750b94f409e5dfe66bd07ced00bbbcdf5d6b180234c'; \
76+
GHC_SHA256='fb61dea556a2023dc2d50ee61a22144bb23e4229a378e533065124c218f40cfc'; \
7777
;; \
7878
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
7979
esac; \
@@ -99,7 +99,7 @@ RUN set -eux; \
9999
\
100100
"/opt/ghc/$GHC/bin/ghc" --version
101101

102-
ARG STACK=2.7.3
102+
ARG STACK=2.7.5
103103
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
104104

105105
RUN set -eux; \
@@ -116,7 +116,7 @@ RUN set -eux; \
116116
INSTALL_STACK="false"; \
117117
;; \
118118
'x86_64') \
119-
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
119+
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
120120
;; \
121121
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
122122
esac; \

0 commit comments

Comments
 (0)