Skip to content

Commit 78cccc4

Browse files
committed
Regenerate Haskell CI, bump it to GHC 9.12.2
1 parent d1fddc5 commit 78cccc4

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 19 additions & 14 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.20241223
11+
# version: 0.19.20250917
1212
#
13-
# REGENDATA ("0.19.20241223",["github","HTTP.cabal"])
13+
# REGENDATA ("0.19.20250917",["github","HTTP.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -20,10 +20,13 @@ 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 }}
26-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-24.04
2730
timeout-minutes:
2831
60
2932
container:
@@ -32,24 +35,24 @@ jobs:
3235
strategy:
3336
matrix:
3437
include:
35-
- compiler: ghc-9.12.1
38+
- compiler: ghc-9.12.2
3639
compilerKind: ghc
37-
compilerVersion: 9.12.1
40+
compilerVersion: 9.12.2
3841
setup-method: ghcup
3942
allow-failure: false
40-
- compiler: ghc-9.10.1
43+
- compiler: ghc-9.10.3
4144
compilerKind: ghc
42-
compilerVersion: 9.10.1
45+
compilerVersion: 9.10.3
4346
setup-method: ghcup
4447
allow-failure: false
4548
- compiler: ghc-9.8.4
4649
compilerKind: ghc
4750
compilerVersion: 9.8.4
4851
setup-method: ghcup
4952
allow-failure: false
50-
- compiler: ghc-9.6.6
53+
- compiler: ghc-9.6.7
5154
compilerKind: ghc
52-
compilerVersion: 9.6.6
55+
compilerVersion: 9.6.7
5356
setup-method: ghcup
5457
allow-failure: false
5558
- compiler: ghc-9.4.8
@@ -101,12 +104,12 @@ jobs:
101104
- name: Install GHCup
102105
run: |
103106
mkdir -p "$HOME/.ghcup/bin"
104-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
107+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
105108
chmod a+x "$HOME/.ghcup/bin/ghcup"
106109
- name: Install cabal-install
107110
run: |
108-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
109-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.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"
110113
- name: Install GHC (GHCup)
111114
if: matrix.setup-method == 'ghcup'
112115
run: |
@@ -182,7 +185,7 @@ jobs:
182185
chmod a+x $HOME/.cabal/bin/cabal-plan
183186
cabal-plan --version
184187
- name: checkout
185-
uses: actions/checkout@v4
188+
uses: actions/checkout@v5
186189
with:
187190
path: source
188191
- name: initial cabal.project for sdist
@@ -207,7 +210,9 @@ jobs:
207210
touch cabal.project.local
208211
echo "packages: ${PKGDIR_HTTP}" >> cabal.project
209212
echo "package HTTP" >> cabal.project
210-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
213+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
214+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package HTTP" >> cabal.project ; fi
215+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
211216
cat >> cabal.project <<EOF
212217
EOF
213218
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(HTTP)$/; }' >> cabal.project.local

HTTP.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ Description:
5858
Extra-Source-Files: CHANGES
5959

6060
tested-with:
61-
GHC == 9.12.1
62-
GHC == 9.10.1
61+
GHC == 9.12.2
62+
GHC == 9.10.3
6363
GHC == 9.8.4
64-
GHC == 9.6.6
64+
GHC == 9.6.7
6565
GHC == 9.4.8
6666
GHC == 9.2.8
6767
GHC == 9.0.2

cabal.haskell-ci

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
branches: master
2+
error-unused-packages: False

0 commit comments

Comments
 (0)