Skip to content

Commit c34b0dd

Browse files
committed
Bump Haskell CI to GHC 9.14.1
1 parent b838f00 commit c34b0dd

4 files changed

Lines changed: 25 additions & 11 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
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","MiniAgda.cabal"])
13+
# REGENDATA ("0.19.20260104",["github","MiniAgda.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -20,6 +20,9 @@ on:
2020
pull_request:
2121
branches:
2222
- master
23+
merge_group:
24+
branches:
25+
- master
2326
jobs:
2427
linux:
2528
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -32,14 +35,19 @@ jobs:
3235
strategy:
3336
matrix:
3437
include:
38+
- compiler: ghc-9.14.1
39+
compilerKind: ghc
40+
compilerVersion: 9.14.1
41+
setup-method: ghcup
42+
allow-failure: false
3543
- compiler: ghc-9.12.2
3644
compilerKind: ghc
3745
compilerVersion: 9.12.2
3846
setup-method: ghcup
3947
allow-failure: false
40-
- compiler: ghc-9.10.2
48+
- compiler: ghc-9.10.3
4149
compilerKind: ghc
42-
compilerVersion: 9.10.2
50+
compilerVersion: 9.10.3
4351
setup-method: ghcup
4452
allow-failure: false
4553
- compiler: ghc-9.8.4
@@ -110,8 +118,8 @@ jobs:
110118
chmod a+x "$HOME/.ghcup/bin/ghcup"
111119
- name: Install cabal-install
112120
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"
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"
115123
- name: Install GHC (GHCup)
116124
if: matrix.setup-method == 'ghcup'
117125
run: |
@@ -187,7 +195,7 @@ jobs:
187195
chmod a+x $HOME/.cabal/bin/cabal-plan
188196
cabal-plan --version
189197
- name: checkout
190-
uses: actions/checkout@v4
198+
uses: actions/checkout@v5
191199
with:
192200
path: source
193201
- name: initial cabal.project for sdist
@@ -212,7 +220,11 @@ jobs:
212220
touch cabal.project.local
213221
echo "packages: ${PKGDIR_MiniAgda}" >> cabal.project
214222
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package MiniAgda" >> cabal.project ; fi
215-
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 MiniAgda" >> cabal.project ; fi
225+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
226+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package MiniAgda" >> cabal.project ; fi
227+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
216228
cat >> cabal.project <<EOF
217229
EOF
218230
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(MiniAgda)$/; }' >> cabal.project.local

.github/workflows/stack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ubuntu-22.04]
21+
os: [ubuntu-latest]
2222
ghc: ['9.12', '9.10', '9.8', '9.6']
2323
include:
2424
- os: macOS-latest

MiniAgda.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ description:
2424
patterns for a more general handling of coinduction.
2525

2626
tested-with:
27+
GHC == 9.14.1
2728
GHC == 9.12.2
28-
GHC == 9.10.2
29+
GHC == 9.10.3
2930
GHC == 9.8.4
3031
GHC == 9.6.7
3132
GHC == 9.4.8
@@ -81,7 +82,6 @@ library
8182
-- optparse-applicative-0.16.0.0 adds some1
8283
, pretty >= 1.0 && < 1.2
8384
, string-qq
84-
, transformers
8585

8686
build-tool-depends: happy:happy >= 1.15 && < 3
8787
, alex:alex >= 3.0 && < 4

cabal.haskell-ci

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
branches: master
2+
error-incomplete-patterns: False
3+
24
installed: +all
35
tests: >= 8.4
46
-- goldplate only compiles with GHC-8.4 and up

0 commit comments

Comments
 (0)