Skip to content

Commit

Permalink
Merge pull request #67 from AlistairB/bumps
Browse files Browse the repository at this point in the history
Bumps stack and GHC
  • Loading branch information
AlistairB authored Mar 7, 2022
2 parents 56d3f99 + ec98669 commit 210996a
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['8.10.7', '9.0.2', '9.2.1']
ghc: ['8.10.7', '9.0.2', '9.2.2']
deb: ['buster', 'slim-buster']
include:
- ghc: '8.10.7'
ghc_minor: '8.10'
- ghc: '9.0.2'
ghc_minor: '9.0'
- ghc: '9.2.1'
- ghc: '9.2.2'
ghc_minor: '9.2'
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['8.10.7', '9.0.2', '9.2.1']
ghc: ['8.10.7', '9.0.2', '9.2.2']
# uraimo/run-on-arch-action does not support debian slim variants
deb: ['buster']
arch: ['aarch64']
Expand All @@ -66,7 +66,7 @@ jobs:
ghc_minor: '8.10'
- ghc: '9.0.2'
ghc_minor: '9.0'
- ghc: '9.2.1'
- ghc: '9.2.2'
ghc_minor: '9.2'
- arch: aarch64
docker_platform: arm64
Expand Down
4 changes: 2 additions & 2 deletions 8.10/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ARG STACK=2.7.3
ARG STACK=2.7.5
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442

RUN set -eux; \
Expand All @@ -133,7 +133,7 @@ RUN set -eux; \
INSTALL_STACK="false"; \
;; \
'x86_64') \
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
Expand Down
4 changes: 2 additions & 2 deletions 8.10/slim-buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ARG STACK=2.7.3
ARG STACK=2.7.5
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442

RUN set -eux; \
Expand All @@ -133,7 +133,7 @@ RUN set -eux; \
INSTALL_STACK="false"; \
;; \
'x86_64') \
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
Expand Down
4 changes: 2 additions & 2 deletions 9.0/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ARG STACK=2.7.3
ARG STACK=2.7.5
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442

RUN set -eux; \
Expand All @@ -133,7 +133,7 @@ RUN set -eux; \
INSTALL_STACK="false"; \
;; \
'x86_64') \
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
Expand Down
4 changes: 2 additions & 2 deletions 9.0/slim-buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ARG STACK=2.7.3
ARG STACK=2.7.5
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442

RUN set -eux; \
Expand All @@ -133,7 +133,7 @@ RUN set -eux; \
INSTALL_STACK="false"; \
;; \
'x86_64') \
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
Expand Down
10 changes: 5 additions & 5 deletions 9.2/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN set -eux; \
\
cabal --version

ARG GHC=9.2.1
ARG GHC=9.2.2
ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD

RUN set -eux; \
Expand All @@ -72,10 +72,10 @@ RUN set -eux; \
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
case "$ARCH" in \
'aarch64') \
GHC_SHA256='717d4246a8b407a807048ce6eddb2785aca2e4c73b6b634c01e1726f42d539a1'; \
GHC_SHA256='f3621ccba7ae48fcd67a9505f61bb5ccfb05c4cbfecd5a6ea65fe3f150af0e98'; \
;; \
'x86_64') \
GHC_SHA256='53f1650ed092230480ff5750b94f409e5dfe66bd07ced00bbbcdf5d6b180234c'; \
GHC_SHA256='fb61dea556a2023dc2d50ee61a22144bb23e4229a378e533065124c218f40cfc'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
Expand All @@ -99,7 +99,7 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ARG STACK=2.7.3
ARG STACK=2.7.5
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442

RUN set -eux; \
Expand All @@ -116,7 +116,7 @@ RUN set -eux; \
INSTALL_STACK="false"; \
;; \
'x86_64') \
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
Expand Down
10 changes: 5 additions & 5 deletions 9.2/slim-buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN set -eux; \
\
cabal --version

ARG GHC=9.2.1
ARG GHC=9.2.2
ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD

RUN set -eux; \
Expand All @@ -70,10 +70,10 @@ RUN set -eux; \
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
case "$ARCH" in \
'aarch64') \
GHC_SHA256='717d4246a8b407a807048ce6eddb2785aca2e4c73b6b634c01e1726f42d539a1'; \
GHC_SHA256='f3621ccba7ae48fcd67a9505f61bb5ccfb05c4cbfecd5a6ea65fe3f150af0e98'; \
;; \
'x86_64') \
GHC_SHA256='53f1650ed092230480ff5750b94f409e5dfe66bd07ced00bbbcdf5d6b180234c'; \
GHC_SHA256='fb61dea556a2023dc2d50ee61a22144bb23e4229a378e533065124c218f40cfc'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
Expand All @@ -99,7 +99,7 @@ RUN set -eux; \
\
"/opt/ghc/$GHC/bin/ghc" --version

ARG STACK=2.7.3
ARG STACK=2.7.5
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442

RUN set -eux; \
Expand All @@ -116,7 +116,7 @@ RUN set -eux; \
INSTALL_STACK="false"; \
;; \
'x86_64') \
STACK_SHA256='a6c090555fa1c64aa61c29aa4449765a51d79e870cf759cde192937cd614e72b'; \
STACK_SHA256='9bcd165358d4dcafd2b33320d4fe98ce72faaf62300cc9b0fb86a27eb670da50'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
Expand Down

0 comments on commit 210996a

Please sign in to comment.