Skip to content

Commit 0742c7d

Browse files
committed
agda-stdlib-utils: allow base-4.22 for GHC 9.14
1 parent 0af0768 commit 0742c7d

File tree

2 files changed

+31
-15
lines changed

2 files changed

+31
-15
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 27 additions & 12 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.20260209
1212
#
13-
# REGENDATA ("0.19.20250506",["github","--no-cabal-check","agda-stdlib-utils.cabal"])
13+
# REGENDATA ("0.19.20260209",["github","--no-cabal-check","agda-stdlib-utils.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -22,6 +22,12 @@ on:
2222
branches:
2323
- master
2424
- experimental
25+
merge_group:
26+
branches:
27+
- master
28+
- experimental
29+
workflow_dispatch:
30+
{}
2531
jobs:
2632
linux:
2733
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -34,14 +40,19 @@ jobs:
3440
strategy:
3541
matrix:
3642
include:
37-
- compiler: ghc-9.12.2
43+
- compiler: ghc-9.14.1
44+
compilerKind: ghc
45+
compilerVersion: 9.14.1
46+
setup-method: ghcup
47+
allow-failure: false
48+
- compiler: ghc-9.12.4
3849
compilerKind: ghc
39-
compilerVersion: 9.12.2
50+
compilerVersion: 9.12.4
4051
setup-method: ghcup
4152
allow-failure: false
42-
- compiler: ghc-9.10.2
53+
- compiler: ghc-9.10.3
4354
compilerKind: ghc
44-
compilerVersion: 9.10.2
55+
compilerVersion: 9.10.3
4556
setup-method: ghcup
4657
allow-failure: false
4758
- compiler: ghc-9.8.4
@@ -97,8 +108,8 @@ jobs:
97108
chmod a+x "$HOME/.ghcup/bin/ghcup"
98109
- name: Install cabal-install
99110
run: |
100-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
111+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
112+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
102113
- name: Install GHC (GHCup)
103114
if: matrix.setup-method == 'ghcup'
104115
run: |
@@ -174,7 +185,7 @@ jobs:
174185
chmod a+x $HOME/.cabal/bin/cabal-plan
175186
cabal-plan --version
176187
- name: checkout
177-
uses: actions/checkout@v4
188+
uses: actions/checkout@v6
178189
with:
179190
path: source
180191
- name: initial cabal.project for sdist
@@ -199,7 +210,11 @@ jobs:
199210
touch cabal.project.local
200211
echo "packages: ${PKGDIR_agda_stdlib_utils}" >> cabal.project
201212
echo "package agda-stdlib-utils" >> cabal.project
202-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
213+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
214+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package agda-stdlib-utils" >> cabal.project ; fi
215+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
216+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package agda-stdlib-utils" >> cabal.project ; fi
217+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
203218
cat >> cabal.project <<EOF
204219
EOF
205220
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(agda-stdlib-utils)$/; }' >> cabal.project.local
@@ -210,7 +225,7 @@ jobs:
210225
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
211226
cabal-plan
212227
- name: restore cache
213-
uses: actions/cache/restore@v4
228+
uses: actions/cache/restore@v5
214229
with:
215230
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
216231
path: ~/.cabal/store
@@ -234,7 +249,7 @@ jobs:
234249
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
235250
- name: save cache
236251
if: always()
237-
uses: actions/cache/save@v4
252+
uses: actions/cache/save@v5
238253
with:
239254
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
240255
path: ~/.cabal/store

agda-stdlib-utils.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ description: Helper programs for setting up the Agda standard library.
66
license: MIT
77

88
tested-with:
9-
GHC == 9.12.2
10-
GHC == 9.10.2
9+
GHC == 9.14.1
10+
GHC == 9.12.4
11+
GHC == 9.10.3
1112
GHC == 9.8.4
1213
GHC == 9.6.7
1314
GHC == 9.4.8
@@ -25,7 +26,7 @@ common common-build-parameters
2526
PatternSynonyms
2627

2728
build-depends:
28-
base >= 4.12.0.0 && < 4.22
29+
base >= 4.12.0.0 && < 4.23
2930
, filemanip >= 0.3.6.2 && < 0.4
3031

3132
executable GenerateEverything

0 commit comments

Comments
 (0)