Skip to content

Commit 9f2d3d3

Browse files
committed
Regenerate CI
1 parent 1eddf63 commit 9f2d3d3

File tree

1 file changed

+23
-34
lines changed

1 file changed

+23
-34
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20241219
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20241219",["github","orthotope.cabal"])
13+
# REGENDATA ("0.19.20260104",["github","orthotope.cabal"])
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 }}
22-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-24.04
2324
timeout-minutes:
2425
60
2526
container:
@@ -28,29 +29,29 @@ jobs:
2829
strategy:
2930
matrix:
3031
include:
31-
- compiler: ghc-9.12.1
32+
- compiler: ghc-9.14.1
3233
compilerKind: ghc
33-
compilerVersion: 9.12.1
34+
compilerVersion: 9.14.1
3435
setup-method: ghcup
3536
allow-failure: false
36-
- compiler: ghc-9.10.1
37+
- compiler: ghc-9.10.3
3738
compilerKind: ghc
38-
compilerVersion: 9.10.1
39+
compilerVersion: 9.10.3
3940
setup-method: ghcup
4041
allow-failure: false
4142
- compiler: ghc-9.8.4
4243
compilerKind: ghc
4344
compilerVersion: 9.8.4
4445
setup-method: ghcup
4546
allow-failure: false
46-
- compiler: ghc-9.6.6
47+
- compiler: ghc-9.6.7
4748
compilerKind: ghc
48-
compilerVersion: 9.6.6
49+
compilerVersion: 9.6.7
4950
setup-method: ghcup
5051
allow-failure: false
51-
- compiler: ghc-9.4.7
52+
- compiler: ghc-9.4.8
5253
compilerKind: ghc
53-
compilerVersion: 9.4.7
54+
compilerVersion: 9.4.8
5455
setup-method: ghcup
5556
allow-failure: false
5657
- compiler: ghc-9.2.8
@@ -77,13 +78,12 @@ jobs:
7778
- name: Install GHCup
7879
run: |
7980
mkdir -p "$HOME/.ghcup/bin"
80-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
81+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
8182
chmod a+x "$HOME/.ghcup/bin/ghcup"
82-
- name: Install cabal-install (prerelease)
83+
- name: Install cabal-install
8384
run: |
84-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
85-
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
86-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
85+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
86+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
8787
- name: Install GHC (GHCup)
8888
if: matrix.setup-method == 'ghcup'
8989
run: |
@@ -108,7 +108,7 @@ jobs:
108108
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
109109
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
110110
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
111-
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
111+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
112112
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
113113
env:
114114
HCKIND: ${{ matrix.compilerKind }}
@@ -136,18 +136,6 @@ jobs:
136136
repository hackage.haskell.org
137137
url: http://hackage.haskell.org/
138138
EOF
139-
if $HEADHACKAGE; then
140-
cat >> $CABAL_CONFIG <<EOF
141-
repository head.hackage.ghc.haskell.org
142-
url: https://ghc.gitlab.haskell.org/head.hackage/
143-
secure: True
144-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
145-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
146-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
147-
key-threshold: 3
148-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
149-
EOF
150-
fi
151139
cat >> $CABAL_CONFIG <<EOF
152140
program-default-options
153141
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -171,7 +159,7 @@ jobs:
171159
chmod a+x $HOME/.cabal/bin/cabal-plan
172160
cabal-plan --version
173161
- name: checkout
174-
uses: actions/checkout@v4
162+
uses: actions/checkout@v5
175163
with:
176164
path: source
177165
- name: initial cabal.project for sdist
@@ -196,12 +184,13 @@ jobs:
196184
touch cabal.project.local
197185
echo "packages: ${PKGDIR_orthotope}" >> cabal.project
198186
echo "package orthotope" >> cabal.project
199-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
187+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
188+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package orthotope" >> cabal.project ; fi
189+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
190+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package orthotope" >> cabal.project ; fi
191+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
200192
cat >> cabal.project <<EOF
201193
EOF
202-
if $HEADHACKAGE; then
203-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
204-
fi
205194
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(orthotope)$/; }' >> cabal.project.local
206195
cat cabal.project
207196
cat cabal.project.local

0 commit comments

Comments
 (0)