Skip to content

Commit a190831

Browse files
committed
Regenerate CI
1 parent d4fe7c0 commit a190831

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 21 additions & 8 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.20250604
11+
# version: 0.19.20250917
1212
#
13-
# REGENDATA ("0.19.20250604",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20250917",["github","--config=cabal.haskell-ci","cabal.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 }}
@@ -106,8 +107,8 @@ jobs:
106107
chmod a+x "$HOME/.ghcup/bin/ghcup"
107108
- name: Install cabal-install
108109
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"
110+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
111+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
111112
- name: Install GHC (GHCup)
112113
if: matrix.setup-method == 'ghcup'
113114
run: |
@@ -183,7 +184,7 @@ jobs:
183184
chmod a+x $HOME/.cabal/bin/cabal-plan
184185
cabal-plan --version
185186
- name: checkout
186-
uses: actions/checkout@v4
187+
uses: actions/checkout@v5
187188
with:
188189
path: source
189190
- name: initial cabal.project for sdist
@@ -216,11 +217,23 @@ jobs:
216217
echo "packages: ${PKGDIR_criterion_measurement}" >> cabal.project
217218
echo "packages: ${PKGDIR_criterion_examples}" >> cabal.project
218219
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package criterion" >> cabal.project ; fi
219-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
220+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
220221
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package criterion-measurement" >> cabal.project ; fi
221-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
222+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
222223
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package criterion-examples" >> cabal.project ; fi
223-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
224+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
225+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package criterion" >> cabal.project ; fi
226+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
227+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package criterion-measurement" >> cabal.project ; fi
228+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
229+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package criterion-examples" >> cabal.project ; fi
230+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
231+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package criterion" >> cabal.project ; fi
232+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
233+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package criterion-measurement" >> cabal.project ; fi
234+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
235+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package criterion-examples" >> cabal.project ; fi
236+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
224237
cat >> cabal.project <<EOF
225238
package criterion
226239
ghc-options: -Werror

0 commit comments

Comments
 (0)