Skip to content

Commit b504c51

Browse files
committed
Bump Haskell CI to GHC 9.12.1
1 parent 3f7fc0c commit b504c51

File tree

2 files changed

+46
-19
lines changed

2 files changed

+46
-19
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 44 additions & 18 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.19.20240703
11+
# version: 0.19.20241219
1212
#
13-
# REGENDATA ("0.19.20240703",["github","alex.cabal"])
13+
# REGENDATA ("0.19.20241219",["github","alex.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.12.1
36+
compilerKind: ghc
37+
compilerVersion: 9.12.1
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
3843
setup-method: ghcup
3944
allow-failure: false
40-
- compiler: ghc-9.8.2
45+
- compiler: ghc-9.8.4
4146
compilerKind: ghc
42-
compilerVersion: 9.8.2
47+
compilerVersion: 9.8.4
4348
setup-method: ghcup
4449
allow-failure: false
4550
- compiler: ghc-9.6.6
@@ -94,15 +99,30 @@ jobs:
9499
allow-failure: false
95100
fail-fast: false
96101
steps:
97-
- name: apt
102+
- name: apt-get install
98103
run: |
99104
apt-get update
100105
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
106+
- name: Install GHCup
107+
run: |
101108
mkdir -p "$HOME/.ghcup/bin"
102-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
109+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
103110
chmod a+x "$HOME/.ghcup/bin/ghcup"
111+
- name: Install cabal-install (prerelease)
112+
run: |
113+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
114+
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
115+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
116+
- name: Install GHC (GHCup)
117+
if: matrix.setup-method == 'ghcup'
118+
run: |
104119
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
105-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
120+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
121+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
122+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
123+
echo "HC=$HC" >> "$GITHUB_ENV"
124+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
125+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
106126
env:
107127
HCKIND: ${{ matrix.compilerKind }}
108128
HCNAME: ${{ matrix.compiler }}
@@ -113,21 +133,12 @@ jobs:
113133
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
114134
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
115135
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
116-
HCDIR=/opt/$HCKIND/$HCVER
117-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
118-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
119-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
120-
echo "HC=$HC" >> "$GITHUB_ENV"
121-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
122-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
123-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124136
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
125137
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
126138
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
127139
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
128-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
140+
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
129141
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
130-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
131142
env:
132143
HCKIND: ${{ matrix.compilerKind }}
133144
HCNAME: ${{ matrix.compiler }}
@@ -154,6 +165,18 @@ jobs:
154165
repository hackage.haskell.org
155166
url: http://hackage.haskell.org/
156167
EOF
168+
if $HEADHACKAGE; then
169+
cat >> $CABAL_CONFIG <<EOF
170+
repository head.hackage.ghc.haskell.org
171+
url: https://ghc.gitlab.haskell.org/head.hackage/
172+
secure: True
173+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
174+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
175+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
176+
key-threshold: 3
177+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
178+
EOF
179+
fi
157180
cat >> $CABAL_CONFIG <<EOF
158181
program-default-options
159182
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -218,6 +241,9 @@ jobs:
218241
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
219242
cat >> cabal.project <<EOF
220243
EOF
244+
if $HEADHACKAGE; then
245+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
246+
fi
221247
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(alex)$/; }' >> cabal.project.local
222248
cat cabal.project
223249
cat cabal.project.local
@@ -262,8 +288,8 @@ jobs:
262288
rm -f cabal.project.local
263289
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
264290
- name: save cache
265-
uses: actions/cache/save@v4
266291
if: always()
292+
uses: actions/cache/save@v4
267293
with:
268294
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
269295
path: ~/.cabal/store

alex.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ category: Development
2222
build-type: Simple
2323

2424
tested-with:
25+
GHC == 9.12.1
2526
GHC == 9.10.1
26-
GHC == 9.8.2
27+
GHC == 9.8.4
2728
GHC == 9.6.6
2829
GHC == 9.4.8
2930
GHC == 9.2.8

0 commit comments

Comments
 (0)