Skip to content

Commit 3c026d3

Browse files
committed
Bump CI to GHC 9.10.0
1 parent c9d5fbc commit 3c026d3

File tree

2 files changed

+32
-10
lines changed

2 files changed

+32
-10
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 30 additions & 9 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.20240110
11+
# version: 0.18.1.20240316
1212
#
13-
# REGENDATA ("0.17.20240110",["github","netrc.cabal"])
13+
# REGENDATA ("0.18.1.20240316",["github","netrc.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,9 +32,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.1
35+
- compiler: ghc-9.10.0.20240313
3636
compilerKind: ghc
37-
compilerVersion: 9.8.1
37+
compilerVersion: 9.10.0.20240313
38+
setup-method: ghcup
39+
allow-failure: false
40+
- compiler: ghc-9.8.2
41+
compilerKind: ghc
42+
compilerVersion: 9.8.2
3843
setup-method: ghcup
3944
allow-failure: false
4045
- compiler: ghc-9.6.4
@@ -96,8 +101,9 @@ jobs:
96101
mkdir -p "$HOME/.ghcup/bin"
97102
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
98103
chmod a+x "$HOME/.ghcup/bin/ghcup"
104+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://github.com/raw/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
99105
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
100-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
101107
env:
102108
HCKIND: ${{ matrix.compilerKind }}
103109
HCNAME: ${{ matrix.compiler }}
@@ -115,12 +121,12 @@ jobs:
115121
echo "HC=$HC" >> "$GITHUB_ENV"
116122
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
117123
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
118-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV"
119125
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
120126
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
121127
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
122128
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
123-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
129+
if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
124130
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
125131
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
126132
env:
@@ -149,6 +155,18 @@ jobs:
149155
repository hackage.haskell.org
150156
url: http://hackage.haskell.org/
151157
EOF
158+
if $HEADHACKAGE; then
159+
cat >> $CABAL_CONFIG <<EOF
160+
repository head.hackage.ghc.haskell.org
161+
url: https://ghc.gitlab.haskell.org/head.hackage/
162+
secure: True
163+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
164+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
165+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
166+
key-threshold: 3
167+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
168+
EOF
169+
fi
152170
cat >> $CABAL_CONFIG <<EOF
153171
program-default-options
154172
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -200,6 +218,9 @@ jobs:
200218
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
201219
cat >> cabal.project <<EOF
202220
EOF
221+
if $HEADHACKAGE; then
222+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
223+
fi
203224
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(netrc)$/; }' >> cabal.project.local
204225
cat cabal.project
205226
cat cabal.project.local
@@ -208,7 +229,7 @@ jobs:
208229
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
209230
cabal-plan
210231
- name: restore cache
211-
uses: actions/cache/restore@v3
232+
uses: actions/cache/restore@v4
212233
with:
213234
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
214235
path: ~/.cabal/store
@@ -238,7 +259,7 @@ jobs:
238259
rm -f cabal.project.local
239260
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
240261
- name: save cache
241-
uses: actions/cache/save@v3
262+
uses: actions/cache/save@v4
242263
if: always()
243264
with:
244265
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

netrc.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ description:
2020

2121

2222
tested-with:
23-
GHC == 9.8.1
23+
GHC == 9.10.0
24+
GHC == 9.8.2
2425
GHC == 9.6.4
2526
GHC == 9.4.8
2627
GHC == 9.2.8

0 commit comments

Comments
 (0)