Skip to content

Commit 1713690

Browse files
andreasabelandreasabel
committed
Bump CI to GHC 9.12.2
1 parent 7ea4164 commit 1713690

File tree

2 files changed

+49
-32
lines changed

2 files changed

+49
-32
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 44 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.17.20231012
11+
# version: 0.19.20250506
1212
#
13-
# REGENDATA ("0.17.20231012",["github","deepseq-generics.cabal"])
13+
# REGENDATA ("0.19.20250506",["github","deepseq-generics.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,23 +23,38 @@ 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:
30-
image: buildpack-deps:focal
30+
image: buildpack-deps:jammy
3131
continue-on-error: ${{ matrix.allow-failure }}
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.6.1
35+
- compiler: ghc-9.12.2
3636
compilerKind: ghc
37-
compilerVersion: 9.6.1
37+
compilerVersion: 9.12.2
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.4.7
40+
- compiler: ghc-9.10.2
4141
compilerKind: ghc
42-
compilerVersion: 9.4.7
42+
compilerVersion: 9.10.2
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.8.4
46+
compilerKind: ghc
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
53+
setup-method: ghcup
54+
allow-failure: false
55+
- compiler: ghc-9.4.8
56+
compilerKind: ghc
57+
compilerVersion: 9.4.8
4358
setup-method: ghcup
4459
allow-failure: false
4560
- compiler: ghc-9.2.8
@@ -84,16 +99,29 @@ jobs:
8499
allow-failure: false
85100
fail-fast: false
86101
steps:
87-
- name: apt
102+
- name: apt-get install
88103
run: |
89104
apt-get update
90105
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: |
91108
mkdir -p "$HOME/.ghcup/bin"
92-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
109+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
93110
chmod a+x "$HOME/.ghcup/bin/ghcup"
94-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
111+
- name: Install cabal-install
112+
run: |
113+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115+
- name: Install GHC (GHCup)
116+
if: matrix.setup-method == 'ghcup'
117+
run: |
95118
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
96-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (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"
97125
env:
98126
HCKIND: ${{ matrix.compilerKind }}
99127
HCNAME: ${{ matrix.compiler }}
@@ -104,21 +132,12 @@ jobs:
104132
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
105133
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
106134
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
107-
HCDIR=/opt/$HCKIND/$HCVER
108-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
109-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
110-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
111-
echo "HC=$HC" >> "$GITHUB_ENV"
112-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
113-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
114-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115135
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
116136
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
117137
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
118138
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
119139
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
120140
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
121-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
122141
env:
123142
HCKIND: ${{ matrix.compilerKind }}
124143
HCNAME: ${{ matrix.compiler }}
@@ -196,15 +215,15 @@ jobs:
196215
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
197216
cat >> cabal.project <<EOF
198217
EOF
199-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(deepseq-generics)$/; }' >> cabal.project.local
218+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(deepseq-generics)$/; }' >> cabal.project.local
200219
cat cabal.project
201220
cat cabal.project.local
202221
- name: dump install plan
203222
run: |
204223
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
205224
cabal-plan
206225
- name: restore cache
207-
uses: actions/cache/restore@v3
226+
uses: actions/cache/restore@v4
208227
with:
209228
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
210229
path: ~/.cabal/store
@@ -234,8 +253,8 @@ jobs:
234253
rm -f cabal.project.local
235254
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
236255
- name: save cache
237-
uses: actions/cache/save@v3
238256
if: always()
257+
uses: actions/cache/save@v4
239258
with:
240259
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
241260
path: ~/.cabal/store

‎deepseq-generics.cabal‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ build-type: Simple
1515
cabal-version: >=1.10
1616

1717
tested-with:
18-
GHC == 9.8.1
19-
GHC == 9.6.3
20-
GHC == 9.4.7
18+
GHC == 9.12.2
19+
GHC == 9.10.2
20+
GHC == 9.8.4
21+
GHC == 9.6.7
22+
GHC == 9.4.8
2123
GHC == 9.2.8
2224
GHC == 9.0.2
2325
GHC == 8.10.7
@@ -26,10 +28,6 @@ tested-with:
2628
GHC == 8.4.4
2729
GHC == 8.2.2
2830
GHC == 8.0.2
29-
-- GHC == 7.10.3
30-
-- GHC == 7.8.4
31-
-- GHC == 7.6.3
32-
-- GHC == 7.4.2
3331

3432
description:
3533
This package provides a "GHC.Generics"-based

0 commit comments

Comments
 (0)