Skip to content

Commit 61c995c

Browse files
committed
CI: Bump GHC 9.4 to 9.4.8
1 parent c46ca0d commit 61c995c

5 files changed

Lines changed: 14 additions & 12 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.17.20231012
11+
# version: 0.17.20231112
1212
#
13-
# REGENDATA ("0.17.20231012",["github","hackage-cli.cabal"])
13+
# REGENDATA ("0.17.20231112",["github","hackage-cli.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -42,9 +42,9 @@ jobs:
4242
compilerVersion: 9.6.3
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.4.7
45+
- compiler: ghc-9.4.8
4646
compilerKind: ghc
47-
compilerVersion: 9.4.7
47+
compilerVersion: 9.4.8
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.2.8
@@ -89,11 +89,10 @@ jobs:
8989
apt-get update
9090
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
9191
mkdir -p "$HOME/.ghcup/bin"
92-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
92+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
9393
chmod a+x "$HOME/.ghcup/bin/ghcup"
94-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
9594
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
96-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
95+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9796
apt-get update
9897
apt-get install -y libbrotli-dev
9998
env:
@@ -113,7 +112,7 @@ jobs:
113112
echo "HC=$HC" >> "$GITHUB_ENV"
114113
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
115114
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
116-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
117116
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
118117
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
119118
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

.github/workflows/stack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest]
17-
ghc-ver: [9.6.3, 9.4.7, 9.2.8, 9.0.2, 8.10.7]
17+
ghc-ver: [9.6.3, 9.4.8, 9.2.8, 9.0.2, 8.10.7]
1818
# On ubuntu-22.04 the old versions 8.8.4, 8.6.5, 8.4.4, 8.2.2 fail due to HsOpenSSL linking errors.
1919
# They used to work under ubuntu-20.04, but it is not worth the trouble maintaining them.
2020
# Apparently, HsOpenSSL-0.11.6 and older are too old for ubuntu-22.04.

hackage-cli.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tested-with:
2020
-- Keep in descending order.
2121
GHC == 9.8.1
2222
GHC == 9.6.3
23-
GHC == 9.4.7
23+
GHC == 9.4.8
2424
GHC == 9.2.8
2525
GHC == 9.0.2
2626
GHC == 8.10.7
@@ -36,7 +36,7 @@ extra-source-files:
3636
fixtures/*.cabal
3737
-- Supported GHC versions when building with stack:
3838
stack-9.6.3.yaml
39-
stack-9.4.7.yaml
39+
stack-9.4.8.yaml
4040
stack-9.2.8.yaml
4141
stack-9.0.2.yaml
4242
stack-8.10.7.yaml

stack-9.4.8.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resolver: lts-21.24
2+
compiler: ghc-9.4.8
3+
compiler-check: match-exact

stack-9.6.3.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
resolver: nightly-2023-10-04
1+
resolver: nightly-2023-12-14
22
compiler: ghc-9.6.3
33
compiler-check: match-exact

0 commit comments

Comments
 (0)