Skip to content

Commit 71b41bb

Browse files
committed
Bump CI to GHC 9.12.2
1 parent 3f119f2 commit 71b41bb

File tree

2 files changed

+38
-28
lines changed

2 files changed

+38
-28
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 34 additions & 25 deletions
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.20250506
1212
#
13-
# REGENDATA ("0.19.20240703",["github","brotli-streams.cabal"])
13+
# REGENDATA ("0.19.20250506",["github","brotli-streams.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,19 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.10.1
35+
- compiler: ghc-9.12.2
3636
compilerKind: ghc
37-
compilerVersion: 9.10.1
37+
compilerVersion: 9.12.2
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.8.2
40+
- compiler: ghc-9.10.2
4141
compilerKind: ghc
42-
compilerVersion: 9.8.2
42+
compilerVersion: 9.10.2
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.6.6
45+
- compiler: ghc-9.8.4
4646
compilerKind: ghc
47-
compilerVersion: 9.6.6
47+
compilerVersion: 9.8.4
48+
setup-method: ghcup
49+
allow-failure: false
50+
- compiler: ghc-9.6.7
51+
compilerKind: ghc
52+
compilerVersion: 9.6.7
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.4.8
@@ -94,17 +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+
apt-get install -y libbrotli-dev
107+
- name: Install GHCup
108+
run: |
101109
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"
110+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
103111
chmod a+x "$HOME/.ghcup/bin/ghcup"
112+
- name: Install cabal-install
113+
run: |
114+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
115+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -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)
106-
apt-get update
107-
apt-get install -y libbrotli-dev
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"
108126
env:
109127
HCKIND: ${{ matrix.compilerKind }}
110128
HCNAME: ${{ matrix.compiler }}
@@ -115,21 +133,12 @@ jobs:
115133
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
116134
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
117135
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
118-
HCDIR=/opt/$HCKIND/$HCVER
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"
125-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
126136
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
127137
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
128138
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
129139
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
130140
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
131141
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
132-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
133142
env:
134143
HCKIND: ${{ matrix.compilerKind }}
135144
HCNAME: ${{ matrix.compiler }}
@@ -245,8 +254,8 @@ jobs:
245254
rm -f cabal.project.local
246255
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
247256
- name: save cache
248-
uses: actions/cache/save@v4
249257
if: always()
258+
uses: actions/cache/save@v4
250259
with:
251260
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
252261
path: ~/.cabal/store

brotli-streams.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ description:
2424
.
2525

2626
tested-with:
27-
GHC == 9.10.1
28-
GHC == 9.8.2
29-
GHC == 9.6.6
27+
GHC == 9.12.2
28+
GHC == 9.10.2
29+
GHC == 9.8.4
30+
GHC == 9.6.7
3031
GHC == 9.4.8
3132
GHC == 9.2.8
3233
GHC == 9.0.2

0 commit comments

Comments
 (0)