Skip to content

Commit 037d9fc

Browse files
authored
Merge pull request #184 from well-typed/update-ci
Update CI 2025-07
2 parents 00e8d04 + f20e201 commit 037d9fc

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 16 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.20250104
11+
# version: 0.19.20250710
1212
#
13-
# REGENDATA ("0.19.20250104",["github","--config=cabal.haskell-ci","--benchmarks-jobs=<9.0","cabal.project"])
13+
# REGENDATA ("0.19.20250710",["github","--config=cabal.haskell-ci","--benchmarks-jobs=<9.0","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -102,12 +102,12 @@ jobs:
102102
- name: Install GHCup
103103
run: |
104104
mkdir -p "$HOME/.ghcup/bin"
105-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
105+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
106106
chmod a+x "$HOME/.ghcup/bin/ghcup"
107107
- name: Install cabal-install
108108
run: |
109-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
110-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV"
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"
111111
- name: Install GHC (GHCup)
112112
if: matrix.setup-method == 'ghcup'
113113
run: |
@@ -227,9 +227,17 @@ jobs:
227227
echo "packages: ${PKGDIR_sop_core}" >> cabal.project
228228
echo "packages: ${PKGDIR_generics_sop}" >> cabal.project
229229
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package sop-core" >> cabal.project ; fi
230-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
230+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
231231
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package generics-sop" >> cabal.project ; fi
232-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
232+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
233+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package sop-core" >> cabal.project ; fi
234+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
235+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package generics-sop" >> cabal.project ; fi
236+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
237+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package sop-core" >> cabal.project ; fi
238+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
239+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package generics-sop" >> cabal.project ; fi
240+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
233241
cat >> cabal.project <<EOF
234242
EOF
235243
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(generics-sop|sop-core)$/; }' >> cabal.project.local

0 commit comments

Comments
 (0)