Skip to content

Commit 20bf859

Browse files
committed
Bump CI to GHC 9.10.1
1 parent c4ccf8f commit 20bf859

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 14 additions & 16 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.19.20241111
1212
#
13-
# REGENDATA ("0.17.20231012",["github","happstack-server.cabal"])
13+
# REGENDATA ("0.19.20241111",["github","happstack-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -27,7 +27,7 @@ jobs:
2727
timeout-minutes:
2828
60
2929
container:
30-
image: buildpack-deps:focal
30+
image: buildpack-deps:jammy
3131
continue-on-error: ${{ matrix.allow-failure }}
3232
strategy:
3333
matrix:
@@ -42,14 +42,14 @@ jobs:
4242
compilerVersion: 9.8.2
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.6.3
45+
- compiler: ghc-9.6.6
4646
compilerKind: ghc
47-
compilerVersion: 9.6.3
47+
compilerVersion: 9.6.6
4848
setup-method: ghcup
4949
allow-failure: false
50-
- compiler: ghc-9.4.7
50+
- compiler: ghc-9.4.8
5151
compilerKind: ghc
52-
compilerVersion: 9.4.7
52+
compilerVersion: 9.4.8
5353
setup-method: ghcup
5454
allow-failure: false
5555
- compiler: ghc-9.2.8
@@ -99,11 +99,11 @@ jobs:
9999
apt-get update
100100
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101101
mkdir -p "$HOME/.ghcup/bin"
102-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
102+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
103103
chmod a+x "$HOME/.ghcup/bin/ghcup"
104-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
104+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
105105
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
106-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
107107
env:
108108
HCKIND: ${{ matrix.compilerKind }}
109109
HCNAME: ${{ matrix.compiler }}
@@ -121,7 +121,7 @@ jobs:
121121
echo "HC=$HC" >> "$GITHUB_ENV"
122122
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
123123
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
124-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
125125
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
126126
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
127127
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -181,8 +181,6 @@ jobs:
181181
uses: actions/checkout@v4
182182
with:
183183
path: source
184-
env:
185-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
186184
- name: initial cabal.project for sdist
187185
run: |
188186
touch cabal.project
@@ -208,15 +206,15 @@ jobs:
208206
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
209207
cat >> cabal.project <<EOF
210208
EOF
211-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(happstack-server)$/; }' >> cabal.project.local
209+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(happstack-server)$/; }' >> cabal.project.local
212210
cat cabal.project
213211
cat cabal.project.local
214212
- name: dump install plan
215213
run: |
216214
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
217215
cabal-plan
218216
- name: restore cache
219-
uses: actions/cache/restore@v3
217+
uses: actions/cache/restore@v4
220218
with:
221219
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
222220
path: ~/.cabal/store
@@ -246,7 +244,7 @@ jobs:
246244
rm -f cabal.project.local
247245
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
248246
- name: save cache
249-
uses: actions/cache/save@v3
247+
uses: actions/cache/save@v4
250248
if: always()
251249
with:
252250
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

happstack-server.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ Cabal-Version: >= 1.10
1313
Extra-Source-Files: tests/Happstack/Server/Tests.hs README.md
1414

1515
tested-with:
16+
GHC == 9.10.1
1617
GHC == 9.8.2
17-
GHC == 9.6.3
18-
GHC == 9.4.7
18+
GHC == 9.6.6
19+
GHC == 9.4.8
1920
GHC == 9.2.8
2021
GHC == 9.0.2
2122
GHC == 8.10.7

0 commit comments

Comments
 (0)