Skip to content

Commit e6c1f34

Browse files
andreasabelandreasabel
committed
Bump CI to GHC 9.6.2 (and 9.4.5 and 9.2.8)
1 parent c37600e commit e6c1f34

File tree

2 files changed

+35
-38
lines changed

2 files changed

+35
-38
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.15.20220525
11+
# version: 0.16.6.20230729
1212
#
13-
# REGENDATA ("0.15.20220525",["github","regex-compat.cabal"])
13+
# REGENDATA ("0.16.6.20230729",["github","regex-compat.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.4.0.20220501
35+
- compiler: ghc-9.6.2
3636
compilerKind: ghc
37-
compilerVersion: 9.4.0.20220501
37+
compilerVersion: 9.6.2
3838
setup-method: ghcup
39-
allow-failure: true
40-
- compiler: ghc-9.2.2
39+
allow-failure: false
40+
- compiler: ghc-9.4.5
41+
compilerKind: ghc
42+
compilerVersion: 9.4.5
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.2.8
4146
compilerKind: ghc
42-
compilerVersion: 9.2.2
47+
compilerVersion: 9.2.8
4348
setup-method: ghcup
4449
allow-failure: false
4550
- compiler: ghc-9.0.2
@@ -115,19 +120,18 @@ jobs:
115120
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
116121
if [ "${{ matrix.setup-method }}" = ghcup ]; then
117122
mkdir -p "$HOME/.ghcup/bin"
118-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
123+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
119124
chmod a+x "$HOME/.ghcup/bin/ghcup"
120-
if $HEADHACKAGE; then "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; fi
121-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
122-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
125+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
126+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
123127
else
124128
apt-add-repository -y 'ppa:hvr/ghc'
125129
apt-get update
126130
apt-get install -y "$HCNAME"
127131
mkdir -p "$HOME/.ghcup/bin"
128-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
132+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
129133
chmod a+x "$HOME/.ghcup/bin/ghcup"
130-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
134+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
131135
fi
132136
env:
133137
HCKIND: ${{ matrix.compilerKind }}
@@ -145,20 +149,20 @@ jobs:
145149
echo "HC=$HC" >> "$GITHUB_ENV"
146150
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
147151
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
148-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
152+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
149153
else
150154
HC=$HCDIR/bin/$HCKIND
151155
echo "HC=$HC" >> "$GITHUB_ENV"
152156
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
153157
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
154-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
158+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
155159
fi
156160
157161
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
158162
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
159163
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
160164
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
161-
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
165+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
162166
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
163167
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
164168
env:
@@ -187,17 +191,6 @@ jobs:
187191
repository hackage.haskell.org
188192
url: http://hackage.haskell.org/
189193
EOF
190-
if $HEADHACKAGE; then
191-
cat >> $CABAL_CONFIG <<EOF
192-
repository head.hackage.ghc.haskell.org
193-
url: https://ghc.gitlab.haskell.org/head.hackage/
194-
secure: True
195-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
196-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
197-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
198-
key-threshold: 3
199-
EOF
200-
fi
201194
cat >> $CABAL_CONFIG <<EOF
202195
program-default-options
203196
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -214,14 +207,14 @@ jobs:
214207
- name: install cabal-plan
215208
run: |
216209
mkdir -p $HOME/.cabal/bin
217-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
218-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
210+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
211+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
219212
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
220213
rm -f cabal-plan.xz
221214
chmod a+x $HOME/.cabal/bin/cabal-plan
222215
cabal-plan --version
223216
- name: checkout
224-
uses: actions/checkout@v2
217+
uses: actions/checkout@v3
225218
with:
226219
path: source
227220
- name: initial cabal.project for sdist
@@ -249,18 +242,15 @@ jobs:
249242
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
250243
cat >> cabal.project <<EOF
251244
EOF
252-
if $HEADHACKAGE; then
253-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
254-
fi
255245
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(regex-compat)$/; }' >> cabal.project.local
256246
cat cabal.project
257247
cat cabal.project.local
258248
- name: dump install plan
259249
run: |
260250
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
261251
cabal-plan
262-
- name: cache
263-
uses: actions/cache@v2
252+
- name: restore cache
253+
uses: actions/cache/restore@v3
264254
with:
265255
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
266256
path: ~/.cabal/store
@@ -281,8 +271,14 @@ jobs:
281271
${CABAL} -vnormal check
282272
- name: haddock
283273
run: |
284-
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
274+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
285275
- name: unconstrained build
286276
run: |
287277
rm -f cabal.project.local
288278
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
279+
- name: save cache
280+
uses: actions/cache/save@v3
281+
if: always()
282+
with:
283+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
284+
path: ~/.cabal/store

‎regex-compat.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ extra-source-files:
2222
ChangeLog.md
2323

2424
tested-with:
25-
GHC == 9.4.1
26-
GHC == 9.2.2
25+
GHC == 9.6.2
26+
GHC == 9.4.5
27+
GHC == 9.2.8
2728
GHC == 9.0.2
2829
GHC == 8.10.7
2930
GHC == 8.8.4

0 commit comments

Comments
 (0)