Skip to content

Commit 7e655b3

Browse files
committed
Bump Haskell CI to GHC 9.10.1
1 parent f8fe5f0 commit 7e655b3

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 13 additions & 8 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.18.0.20240225
11+
# version: 0.19.20240703
1212
#
13-
# REGENDATA ("0.18.0.20240225",["github","alex.cabal"])
13+
# REGENDATA ("0.19.20240703",["github","alex.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -27,19 +27,24 @@ jobs:
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.10.1
36+
compilerKind: ghc
37+
compilerVersion: 9.10.1
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.8.2
3641
compilerKind: ghc
3742
compilerVersion: 9.8.2
3843
setup-method: ghcup
3944
allow-failure: false
40-
- compiler: ghc-9.6.4
45+
- compiler: ghc-9.6.6
4146
compilerKind: ghc
42-
compilerVersion: 9.6.4
47+
compilerVersion: 9.6.6
4348
setup-method: ghcup
4449
allow-failure: false
4550
- compiler: ghc-9.4.8
@@ -97,7 +102,7 @@ jobs:
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"
99104
"$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)
105+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101106
env:
102107
HCKIND: ${{ matrix.compilerKind }}
103108
HCNAME: ${{ matrix.compiler }}
@@ -115,7 +120,7 @@ jobs:
115120
echo "HC=$HC" >> "$GITHUB_ENV"
116121
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
117122
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
118-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
123+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
119124
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
120125
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
121126
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -213,7 +218,7 @@ jobs:
213218
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
214219
cat >> cabal.project <<EOF
215220
EOF
216-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(alex)$/; }' >> cabal.project.local
221+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(alex)$/; }' >> cabal.project.local
217222
cat cabal.project
218223
cat cabal.project.local
219224
- name: dump install plan

alex.cabal

Lines changed: 5 additions & 2 deletions
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.10.1
2526
GHC == 9.8.2
26-
GHC == 9.6.4
27+
GHC == 9.6.6
2728
GHC == 9.4.8
2829
GHC == 9.2.8
2930
GHC == 9.0.2
@@ -149,4 +150,6 @@ test-suite tests
149150

150151
default-language: Haskell2010
151152

152-
build-depends: base, process
153+
build-depends:
154+
base < 5
155+
, process

0 commit comments

Comments
 (0)