Skip to content

Commit ecb645f

Browse files
committed
Update CI to GHC 9.12.1
1 parent bfedb42 commit ecb645f

File tree

2 files changed

+31
-20
lines changed

2 files changed

+31
-20
lines changed

.github/workflows/haskell-ci.yml

+29-19
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# haskell-ci regenerate
88
#
9-
# For more information, see https://github.com/andreasabel/haskell-ci
9+
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20240703
11+
# version: 0.19.20250216
1212
#
13-
# REGENDATA ("0.19.20240703",["github","regex-tdfa.cabal"])
13+
# REGENDATA ("0.19.20250216",["github","regex-tdfa.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -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,29 @@ 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"
104-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
111+
- name: Install cabal-install
112+
run: |
105113
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115+
- name: Install GHC (GHCup)
116+
if: matrix.setup-method == 'ghcup'
117+
run: |
118+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
119+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
120+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
121+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
122+
echo "HC=$HC" >> "$GITHUB_ENV"
123+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
124+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
106125
env:
107126
HCKIND: ${{ matrix.compilerKind }}
108127
HCNAME: ${{ matrix.compiler }}
@@ -113,21 +132,12 @@ jobs:
113132
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
114133
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
115134
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"
124135
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
125136
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
126137
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
127138
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
128139
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
129140
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
130-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
131141
env:
132142
HCKIND: ${{ matrix.compilerKind }}
133143
HCNAME: ${{ matrix.compiler }}
@@ -243,8 +253,8 @@ jobs:
243253
rm -f cabal.project.local
244254
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
245255
- name: save cache
246-
uses: actions/cache/save@v4
247256
if: always()
257+
uses: actions/cache/save@v4
248258
with:
249259
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
250260
path: ~/.cabal/store

regex-tdfa.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ extra-source-files:
2626
test/cases/*.txt
2727

2828
tested-with:
29+
GHC == 9.12.1
2930
GHC == 9.10.1
30-
GHC == 9.8.2
31+
GHC == 9.8.4
3132
GHC == 9.6.6
3233
GHC == 9.4.8
3334
GHC == 9.2.8

0 commit comments

Comments
 (0)