Skip to content

Commit 88cd0b3

Browse files
AlistairBAlistairB
authored
Merge pull request #93 from AlistairB/stack-2-9-3
Bump stack to 2.9.3
2 parents 60a070f + d25abd1 commit 88cd0b3

File tree

9 files changed

+162
-210
lines changed

9 files changed

+162
-210
lines changed

‎.github/workflows/debian.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
ghc: ['8.10.7', '9.0.2', '9.2.5', '9.4.3']
25+
ghc: ['8.10.7', '9.0.2', '9.2.5', '9.4.4']
2626
deb: ['buster', 'slim-buster']
2727
include:
2828
- ghc: '8.10.7'
@@ -31,7 +31,7 @@ jobs:
3131
ghc_minor: '9.0'
3232
- ghc: '9.2.5'
3333
ghc_minor: '9.2'
34-
- ghc: '9.4.3'
34+
- ghc: '9.4.4'
3535
ghc_minor: '9.4'
3636
steps:
3737
- uses: actions/checkout@v2
@@ -59,7 +59,7 @@ jobs:
5959
strategy:
6060
fail-fast: false
6161
matrix:
62-
ghc: ['8.10.7', '9.0.2', '9.2.5', '9.4.3']
62+
ghc: ['8.10.7', '9.0.2', '9.2.5', '9.4.4']
6363
# uraimo/run-on-arch-action does not support debian slim variants
6464
deb: ['buster']
6565
arch: ['aarch64']
@@ -70,7 +70,7 @@ jobs:
7070
ghc_minor: '9.0'
7171
- ghc: '9.2.5'
7272
ghc_minor: '9.2'
73-
- ghc: '9.4.3'
73+
- ghc: '9.4.4'
7474
ghc_minor: '9.4'
7575
- arch: aarch64
7676
docker_platform: arm64

‎8.10/buster/Dockerfile

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,39 @@ RUN apt-get update && \
99
libtinfo-dev && \
1010
rm -rf /var/lib/apt/lists/*
1111

12-
ARG STACK=2.9.1
12+
ARG STACK=2.9.3
1313
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
1414

1515
RUN set -eux; \
1616
cd /tmp; \
1717
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
18-
INSTALL_STACK="true"; \
1918
STACK_URL="https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz"; \
2019
# sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
2120
case "$ARCH" in \
2221
'aarch64') \
23-
# Stack does not officially support ARM64, nor do the binaries that exist work.
24-
# Hitting https://github.com/commercialhaskell/stack/issues/2103#issuecomment-972329065 when trying to use
25-
# stack-2.7.1-linux-aarch64.tar.gz
26-
INSTALL_STACK="false"; \
22+
STACK_SHA256='161e1638da9efc56319f7225b3652ca3f339bcda9eadc7d6ce512f325b0f014a'; \
2723
;; \
2824
'x86_64') \
29-
STACK_SHA256='0581cebe880b8ed47556ee73d8bbb9d602b5b82e38f89f6aa53acaec37e7760d'; \
25+
STACK_SHA256='938f689dc45e2693ab1ca3ea215790b3786dfd531dcf6c0bf40842c24e579ae9'; \
3026
;; \
3127
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
3228
esac; \
33-
if [ "$INSTALL_STACK" = "true" ]; then \
34-
curl -sSL "$STACK_URL" -o stack.tar.gz; \
35-
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
36-
\
37-
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
38-
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
39-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
40-
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
41-
gpgconf --kill all; \
42-
\
43-
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
44-
stack config set system-ghc --global true; \
45-
stack config set install-ghc --global false; \
46-
\
47-
rm -rf /tmp/*; \
48-
\
49-
stack --version; \
50-
fi
29+
curl -sSL "$STACK_URL" -o stack.tar.gz; \
30+
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
31+
\
32+
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
33+
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
34+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
35+
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
36+
gpgconf --kill all; \
37+
\
38+
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
39+
stack config set system-ghc --global true; \
40+
stack config set install-ghc --global false; \
41+
\
42+
rm -rf /tmp/*; \
43+
\
44+
stack --version;
5145

5246
ARG CABAL_INSTALL=3.8.1.0
5347
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C

‎8.10/slim-buster/Dockerfile

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,45 +23,39 @@ RUN apt-get update && \
2323
zlib1g-dev && \
2424
rm -rf /var/lib/apt/lists/*
2525

26-
ARG STACK=2.9.1
26+
ARG STACK=2.9.3
2727
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
2828

2929
RUN set -eux; \
3030
cd /tmp; \
3131
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
32-
INSTALL_STACK="true"; \
3332
STACK_URL="https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz"; \
3433
# sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
3534
case "$ARCH" in \
3635
'aarch64') \
37-
# Stack does not officially support ARM64, nor do the binaries that exist work.
38-
# Hitting https://github.com/commercialhaskell/stack/issues/2103#issuecomment-972329065 when trying to use
39-
# stack-2.7.1-linux-aarch64.tar.gz
40-
INSTALL_STACK="false"; \
36+
STACK_SHA256='161e1638da9efc56319f7225b3652ca3f339bcda9eadc7d6ce512f325b0f014a'; \
4137
;; \
4238
'x86_64') \
43-
STACK_SHA256='0581cebe880b8ed47556ee73d8bbb9d602b5b82e38f89f6aa53acaec37e7760d'; \
39+
STACK_SHA256='938f689dc45e2693ab1ca3ea215790b3786dfd531dcf6c0bf40842c24e579ae9'; \
4440
;; \
4541
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
4642
esac; \
47-
if [ "$INSTALL_STACK" = "true" ]; then \
48-
curl -sSL "$STACK_URL" -o stack.tar.gz; \
49-
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
50-
\
51-
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
52-
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
53-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
54-
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
55-
gpgconf --kill all; \
56-
\
57-
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
58-
stack config set system-ghc --global true; \
59-
stack config set install-ghc --global false; \
60-
\
61-
rm -rf /tmp/*; \
62-
\
63-
stack --version; \
64-
fi
43+
curl -sSL "$STACK_URL" -o stack.tar.gz; \
44+
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
45+
\
46+
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
47+
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
48+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
49+
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
50+
gpgconf --kill all; \
51+
\
52+
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
53+
stack config set system-ghc --global true; \
54+
stack config set install-ghc --global false; \
55+
\
56+
rm -rf /tmp/*; \
57+
\
58+
stack --version;
6559

6660
ARG CABAL_INSTALL=3.8.1.0
6761
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C

‎9.0/buster/Dockerfile

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,39 @@ RUN apt-get update && \
99
libtinfo-dev && \
1010
rm -rf /var/lib/apt/lists/*
1111

12-
ARG STACK=2.9.1
12+
ARG STACK=2.9.3
1313
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
1414

1515
RUN set -eux; \
1616
cd /tmp; \
1717
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
18-
INSTALL_STACK="true"; \
1918
STACK_URL="https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz"; \
2019
# sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
2120
case "$ARCH" in \
2221
'aarch64') \
23-
# Stack does not officially support ARM64, nor do the binaries that exist work.
24-
# Hitting https://github.com/commercialhaskell/stack/issues/2103#issuecomment-972329065 when trying to use
25-
# stack-2.7.1-linux-aarch64.tar.gz
26-
INSTALL_STACK="false"; \
22+
STACK_SHA256='161e1638da9efc56319f7225b3652ca3f339bcda9eadc7d6ce512f325b0f014a'; \
2723
;; \
2824
'x86_64') \
29-
STACK_SHA256='0581cebe880b8ed47556ee73d8bbb9d602b5b82e38f89f6aa53acaec37e7760d'; \
25+
STACK_SHA256='938f689dc45e2693ab1ca3ea215790b3786dfd531dcf6c0bf40842c24e579ae9'; \
3026
;; \
3127
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
3228
esac; \
33-
if [ "$INSTALL_STACK" = "true" ]; then \
34-
curl -sSL "$STACK_URL" -o stack.tar.gz; \
35-
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
36-
\
37-
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
38-
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
39-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
40-
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
41-
gpgconf --kill all; \
42-
\
43-
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
44-
stack config set system-ghc --global true; \
45-
stack config set install-ghc --global false; \
46-
\
47-
rm -rf /tmp/*; \
48-
\
49-
stack --version; \
50-
fi
29+
curl -sSL "$STACK_URL" -o stack.tar.gz; \
30+
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
31+
\
32+
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
33+
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
34+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
35+
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
36+
gpgconf --kill all; \
37+
\
38+
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
39+
stack config set system-ghc --global true; \
40+
stack config set install-ghc --global false; \
41+
\
42+
rm -rf /tmp/*; \
43+
\
44+
stack --version;
5145

5246
ARG CABAL_INSTALL=3.8.1.0
5347
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C

‎9.0/slim-buster/Dockerfile

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,45 +23,39 @@ RUN apt-get update && \
2323
zlib1g-dev && \
2424
rm -rf /var/lib/apt/lists/*
2525

26-
ARG STACK=2.9.1
26+
ARG STACK=2.9.3
2727
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
2828

2929
RUN set -eux; \
3030
cd /tmp; \
3131
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
32-
INSTALL_STACK="true"; \
3332
STACK_URL="https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz"; \
3433
# sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
3534
case "$ARCH" in \
3635
'aarch64') \
37-
# Stack does not officially support ARM64, nor do the binaries that exist work.
38-
# Hitting https://github.com/commercialhaskell/stack/issues/2103#issuecomment-972329065 when trying to use
39-
# stack-2.7.1-linux-aarch64.tar.gz
40-
INSTALL_STACK="false"; \
36+
STACK_SHA256='161e1638da9efc56319f7225b3652ca3f339bcda9eadc7d6ce512f325b0f014a'; \
4137
;; \
4238
'x86_64') \
43-
STACK_SHA256='0581cebe880b8ed47556ee73d8bbb9d602b5b82e38f89f6aa53acaec37e7760d'; \
39+
STACK_SHA256='938f689dc45e2693ab1ca3ea215790b3786dfd531dcf6c0bf40842c24e579ae9'; \
4440
;; \
4541
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
4642
esac; \
47-
if [ "$INSTALL_STACK" = "true" ]; then \
48-
curl -sSL "$STACK_URL" -o stack.tar.gz; \
49-
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
50-
\
51-
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
52-
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
53-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
54-
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
55-
gpgconf --kill all; \
56-
\
57-
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
58-
stack config set system-ghc --global true; \
59-
stack config set install-ghc --global false; \
60-
\
61-
rm -rf /tmp/*; \
62-
\
63-
stack --version; \
64-
fi
43+
curl -sSL "$STACK_URL" -o stack.tar.gz; \
44+
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
45+
\
46+
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
47+
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
48+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
49+
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
50+
gpgconf --kill all; \
51+
\
52+
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
53+
stack config set system-ghc --global true; \
54+
stack config set install-ghc --global false; \
55+
\
56+
rm -rf /tmp/*; \
57+
\
58+
stack --version;
6559

6660
ARG CABAL_INSTALL=3.8.1.0
6761
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C

‎9.2/buster/Dockerfile

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,39 @@ RUN apt-get update && \
99
libtinfo-dev && \
1010
rm -rf /var/lib/apt/lists/*
1111

12-
ARG STACK=2.9.1
12+
ARG STACK=2.9.3
1313
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
1414

1515
RUN set -eux; \
1616
cd /tmp; \
1717
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
18-
INSTALL_STACK="true"; \
1918
STACK_URL="https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz"; \
2019
# sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
2120
case "$ARCH" in \
2221
'aarch64') \
23-
# Stack does not officially support ARM64, nor do the binaries that exist work.
24-
# Hitting https://github.com/commercialhaskell/stack/issues/2103#issuecomment-972329065 when trying to use
25-
# stack-2.7.1-linux-aarch64.tar.gz
26-
INSTALL_STACK="false"; \
22+
STACK_SHA256='161e1638da9efc56319f7225b3652ca3f339bcda9eadc7d6ce512f325b0f014a'; \
2723
;; \
2824
'x86_64') \
29-
STACK_SHA256='0581cebe880b8ed47556ee73d8bbb9d602b5b82e38f89f6aa53acaec37e7760d'; \
25+
STACK_SHA256='938f689dc45e2693ab1ca3ea215790b3786dfd531dcf6c0bf40842c24e579ae9'; \
3026
;; \
3127
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
3228
esac; \
33-
if [ "$INSTALL_STACK" = "true" ]; then \
34-
curl -sSL "$STACK_URL" -o stack.tar.gz; \
35-
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
36-
\
37-
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
38-
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
39-
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
40-
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
41-
gpgconf --kill all; \
42-
\
43-
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
44-
stack config set system-ghc --global true; \
45-
stack config set install-ghc --global false; \
46-
\
47-
rm -rf /tmp/*; \
48-
\
49-
stack --version; \
50-
fi
29+
curl -sSL "$STACK_URL" -o stack.tar.gz; \
30+
echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
31+
\
32+
curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
33+
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
34+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY"; \
35+
gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
36+
gpgconf --kill all; \
37+
\
38+
tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack"; \
39+
stack config set system-ghc --global true; \
40+
stack config set install-ghc --global false; \
41+
\
42+
rm -rf /tmp/*; \
43+
\
44+
stack --version;
5145

5246
ARG CABAL_INSTALL=3.8.1.0
5347
ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C

0 commit comments

Comments
 (0)