Skip to content

Commit c0c672a

Browse files
RyanGlScottRyanGlScott
committed
Regenerate CI
1 parent 8b68e67 commit c0c672a

File tree

3 files changed

+24
-50
lines changed

3 files changed

+24
-50
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 21 additions & 46 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.20241202
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20241202",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20260104",["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 }}
22-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-24.04
2324
timeout-minutes:
2425
60
2526
container:
@@ -28,24 +29,24 @@ jobs:
2829
strategy:
2930
matrix:
3031
include:
31-
- compiler: ghc-9.12.0.20241128
32+
- compiler: ghc-9.12.2
3233
compilerKind: ghc
33-
compilerVersion: 9.12.0.20241128
34-
setup-method: ghcup-prerelease
34+
compilerVersion: 9.12.2
35+
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
5152
- compiler: ghc-9.4.8
@@ -102,12 +103,12 @@ jobs:
102103
- name: Install GHCup
103104
run: |
104105
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"
106+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
106107
chmod a+x "$HOME/.ghcup/bin/ghcup"
107108
- name: Install cabal-install
108109
run: |
109-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
110-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.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: |
@@ -122,21 +123,6 @@ jobs:
122123
HCKIND: ${{ matrix.compilerKind }}
123124
HCNAME: ${{ matrix.compiler }}
124125
HCVER: ${{ matrix.compilerVersion }}
125-
- name: Install GHC (GHCup prerelease)
126-
if: matrix.setup-method == 'ghcup-prerelease'
127-
run: |
128-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
129-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
130-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
131-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
132-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
133-
echo "HC=$HC" >> "$GITHUB_ENV"
134-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
135-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
136-
env:
137-
HCKIND: ${{ matrix.compilerKind }}
138-
HCNAME: ${{ matrix.compiler }}
139-
HCVER: ${{ matrix.compilerVersion }}
140126
- name: Set PATH and environment variables
141127
run: |
142128
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -147,7 +133,7 @@ jobs:
147133
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
148134
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
149135
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
150-
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
136+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
151137
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
152138
env:
153139
HCKIND: ${{ matrix.compilerKind }}
@@ -175,18 +161,6 @@ jobs:
175161
repository hackage.haskell.org
176162
url: http://hackage.haskell.org/
177163
EOF
178-
if $HEADHACKAGE; then
179-
cat >> $CABAL_CONFIG <<EOF
180-
repository head.hackage.ghc.haskell.org
181-
url: https://ghc.gitlab.haskell.org/head.hackage/
182-
secure: True
183-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
184-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
185-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
186-
key-threshold: 3
187-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
188-
EOF
189-
fi
190164
cat >> $CABAL_CONFIG <<EOF
191165
program-default-options
192166
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -210,7 +184,7 @@ jobs:
210184
chmod a+x $HOME/.cabal/bin/cabal-plan
211185
cabal-plan --version
212186
- name: checkout
213-
uses: actions/checkout@v4
187+
uses: actions/checkout@v5
214188
with:
215189
path: source
216190
- name: initial cabal.project for sdist
@@ -235,14 +209,15 @@ jobs:
235209
touch cabal.project.local
236210
echo "packages: ${PKGDIR_deriving_compat}" >> cabal.project
237211
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package deriving-compat" >> cabal.project ; fi
238-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
212+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
213+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package deriving-compat" >> cabal.project ; fi
214+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
215+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package deriving-compat" >> cabal.project ; fi
216+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
239217
cat >> cabal.project <<EOF
240218
package deriving-compat
241219
ghc-options: -Werror
242220
EOF
243-
if $HEADHACKAGE; then
244-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
245-
fi
246221
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(deriving-compat)$/; }' >> cabal.project.local
247222
cat cabal.project
248223
cat cabal.project.local

‎cabal.haskell-ci‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
distribution: jammy
21
no-tests-no-benchmarks: False
32
unconstrained: False
43
local-ghc-options: -Werror

‎deriving-compat.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ tested-with: GHC == 8.0.2
8787
, GHC == 9.0.2
8888
, GHC == 9.2.8
8989
, GHC == 9.4.8
90-
, GHC == 9.6.6
90+
, GHC == 9.6.7
9191
, GHC == 9.8.4
92-
, GHC == 9.10.1
93-
, GHC == 9.12.1
92+
, GHC == 9.10.3
93+
, GHC == 9.12.2
9494
cabal-version: >=1.10
9595

9696
source-repository head

0 commit comments

Comments
 (0)