Skip to content

Commit 3a7e8d2

Browse files
committed
Bump Haskell CI to GHC 9.14.1
1 parent 36fdef6 commit 3a7e8d2

4 files changed

Lines changed: 29 additions & 13 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20250506
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20250506",["github","cabal.project","--config","cabal.haskell-ci","--project"])
13+
# REGENDATA ("0.19.20260104",["github","cabal.project","--config","cabal.haskell-ci","--project"])
1414
#
1515
name: Haskell-CI
1616
on:
1717
- push
1818
- pull_request
19+
- merge_group
1920
jobs:
2021
linux:
2122
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -28,14 +29,19 @@ jobs:
2829
strategy:
2930
matrix:
3031
include:
32+
- compiler: ghc-9.14.1
33+
compilerKind: ghc
34+
compilerVersion: 9.14.1
35+
setup-method: ghcup
36+
allow-failure: false
3137
- compiler: ghc-9.12.2
3238
compilerKind: ghc
3339
compilerVersion: 9.12.2
3440
setup-method: ghcup
3541
allow-failure: false
36-
- compiler: ghc-9.10.2
42+
- compiler: ghc-9.10.3
3743
compilerKind: ghc
38-
compilerVersion: 9.10.2
44+
compilerVersion: 9.10.3
3945
setup-method: ghcup
4046
allow-failure: false
4147
- compiler: ghc-9.8.4
@@ -106,8 +112,8 @@ jobs:
106112
chmod a+x "$HOME/.ghcup/bin/ghcup"
107113
- name: Install cabal-install
108114
run: |
109-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
110-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
116+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
111117
- name: Install GHC (GHCup)
112118
if: matrix.setup-method == 'ghcup'
113119
run: |
@@ -183,7 +189,7 @@ jobs:
183189
chmod a+x $HOME/.cabal/bin/cabal-plan
184190
cabal-plan --version
185191
- name: checkout
186-
uses: actions/checkout@v4
192+
uses: actions/checkout@v5
187193
with:
188194
path: source
189195
- name: initial cabal.project for sdist
@@ -212,12 +218,20 @@ jobs:
212218
echo "packages: ${PKGDIR_happy_lib}" >> cabal.project
213219
echo "packages: ${PKGDIR_happy}" >> cabal.project
214220
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package happy-lib" >> cabal.project ; fi
215-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
221+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
216222
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package happy" >> cabal.project ; fi
217-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
223+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
224+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package happy-lib" >> cabal.project ; fi
225+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
226+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package happy" >> cabal.project ; fi
227+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
228+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package happy-lib" >> cabal.project ; fi
229+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
230+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package happy" >> cabal.project ; fi
231+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
218232
cat >> cabal.project <<EOF
219233
EOF
220-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(containers|happy|happy-lib|mtl|transformers)$/; }' >> cabal.project.local
234+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(happy|happy-lib)$/; }' >> cabal.project.local
221235
cat cabal.project
222236
cat cabal.project.local
223237
- name: dump install plan

cabal.haskell-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
-- Specify 'constraint: ... installed' packages
2-
installed: +all -containers -mtl -transformers
2+
-- installed: +all -containers -mtl -transformers

happy.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ Description:
1919
grammar. Happy works in a similar way to the @yacc@ tool for C.
2020

2121
tested-with:
22+
GHC == 9.14.1
2223
GHC == 9.12.2
23-
GHC == 9.10.2
24+
GHC == 9.10.3
2425
GHC == 9.8.4
2526
GHC == 9.6.7
2627
GHC == 9.4.8

lib/happy-lib.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ Description:
3434
multiple parse trees (Happy.Backend.GLR.*)
3535

3636
tested-with:
37+
GHC == 9.14.1
3738
GHC == 9.12.2
38-
GHC == 9.10.2
39+
GHC == 9.10.3
3940
GHC == 9.8.4
4041
GHC == 9.6.7
4142
GHC == 9.4.8

0 commit comments

Comments
 (0)