Skip to content

Commit 0c3835a

Browse files
committed
Bump Haskell CI to GHC 9.14.1
1 parent 36fdef6 commit 0c3835a

File tree

4 files changed

+38
-15
lines changed

4 files changed

+38
-15
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,21 @@
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:
17-
- push
18-
- pull_request
17+
push:
18+
branches:
19+
- master
20+
pull_request:
21+
branches:
22+
- master
23+
merge_group:
24+
branches:
25+
- master
1926
jobs:
2027
linux:
2128
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -28,14 +35,19 @@ jobs:
2835
strategy:
2936
matrix:
3037
include:
38+
- compiler: ghc-9.14.1
39+
compilerKind: ghc
40+
compilerVersion: 9.14.1
41+
setup-method: ghcup
42+
allow-failure: false
3143
- compiler: ghc-9.12.2
3244
compilerKind: ghc
3345
compilerVersion: 9.12.2
3446
setup-method: ghcup
3547
allow-failure: false
36-
- compiler: ghc-9.10.2
48+
- compiler: ghc-9.10.3
3749
compilerKind: ghc
38-
compilerVersion: 9.10.2
50+
compilerVersion: 9.10.3
3951
setup-method: ghcup
4052
allow-failure: false
4153
- compiler: ghc-9.8.4
@@ -106,8 +118,8 @@ jobs:
106118
chmod a+x "$HOME/.ghcup/bin/ghcup"
107119
- name: Install cabal-install
108120
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"
121+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
122+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
111123
- name: Install GHC (GHCup)
112124
if: matrix.setup-method == 'ghcup'
113125
run: |
@@ -183,7 +195,7 @@ jobs:
183195
chmod a+x $HOME/.cabal/bin/cabal-plan
184196
cabal-plan --version
185197
- name: checkout
186-
uses: actions/checkout@v4
198+
uses: actions/checkout@v5
187199
with:
188200
path: source
189201
- name: initial cabal.project for sdist
@@ -212,12 +224,12 @@ jobs:
212224
echo "packages: ${PKGDIR_happy_lib}" >> cabal.project
213225
echo "packages: ${PKGDIR_happy}" >> cabal.project
214226
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
227+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
216228
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
229+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
218230
cat >> cabal.project <<EOF
219231
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
232+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(happy|happy-lib|mtl|transformers)$/; }' >> cabal.project.local
221233
cat cabal.project
222234
cat cabal.project.local
223235
- name: dump install plan

cabal.haskell-ci

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1+
branches: master
2+
error-incomplete-patterns: False
3+
error-unused-packages: False
4+
15
-- Specify 'constraint: ... installed' packages
2-
installed: +all -containers -mtl -transformers
6+
installed: +all -transformers -mtl
7+
-- * mtl is for GHC 8.4:
8+
-- > rejecting: happy-lib-2.1.7 (conflict: mtl => transformers==0.5.5.0/installed-0.5.5.0, happy-lib => transformers>=0.5.6.2)
9+
-- * transformers is for GHCs 8.0 and 8.2:
10+
-- > rejecting: transformers-0.5.2.0/installed-0.5.2.0 (conflict: mtl => transformers>=0.5.6 && <0.7)
11+

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)