Skip to content

Commit ede53f8

Browse files
committed
CI: Regerate spec
Had to add `allow-newer: *:*` for `ghc-9.14`.
1 parent fd56a3d commit ede53f8

1 file changed

Lines changed: 21 additions & 8 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 21 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.20250605
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20250605",["github","cabal.project"])
13+
# REGENDATA ("0.19.20260104",["github","cabal.project"])
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: |
@@ -202,7 +210,7 @@ jobs:
202210
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-72b17435
203211
path: ~/.haskell-ci-tools
204212
- name: checkout
205-
uses: actions/checkout@v4
213+
uses: actions/checkout@v5
206214
with:
207215
path: source
208216
- name: initial cabal.project for sdist
@@ -227,7 +235,12 @@ jobs:
227235
touch cabal.project.local
228236
echo "packages: ${PKGDIR_base64_bytestring_type}" >> cabal.project
229237
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package base64-bytestring-type" >> cabal.project ; fi
230-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
238+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
239+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package base64-bytestring-type" >> cabal.project ; fi
240+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
241+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package base64-bytestring-type" >> cabal.project ; fi
242+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
243+
if [ $((HCNUMVER >= 91400)) -ne 0 ] ; then echo "allow-newer: *:*" >> cabal.project ; fi
231244
cat >> cabal.project <<EOF
232245
EOF
233246
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(base64-bytestring-type)$/; }' >> cabal.project.local

0 commit comments

Comments
 (0)