Skip to content

Commit c366aee

Browse files
andreasabelandreasabel
committed
Bump tested-with and Haskell CI to GHC 9.6.1 alpha, 9.4.4 and 9.2.6
1 parent c37c91c commit c366aee

File tree

8 files changed

+125
-36
lines changed

8 files changed

+125
-36
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 27 additions & 15 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.15.20220812
11+
# version: 0.15.20230211
1212
#
13-
# REGENDATA ("0.15.20220812",["github","cabal.project"])
13+
# REGENDATA ("0.15.20230211",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,14 +28,19 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.4.1
31+
- compiler: ghc-9.6.0.20230128
3232
compilerKind: ghc
33-
compilerVersion: 9.4.1
33+
compilerVersion: 9.6.0.20230128
34+
setup-method: ghcup
35+
allow-failure: true
36+
- compiler: ghc-9.4.4
37+
compilerKind: ghc
38+
compilerVersion: 9.4.4
3439
setup-method: ghcup
3540
allow-failure: false
36-
- compiler: ghc-9.2.4
41+
- compiler: ghc-9.2.6
3742
compilerKind: ghc
38-
compilerVersion: 9.2.4
43+
compilerVersion: 9.2.6
3944
setup-method: ghcup
4045
allow-failure: false
4146
- compiler: ghc-9.0.2
@@ -105,15 +110,16 @@ jobs:
105110
chmod a+x "$HOME/.ghcup/bin/ghcup"
106111
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
107112
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
108-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
113+
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
109114
else
110115
apt-add-repository -y 'ppa:hvr/ghc'
111116
apt-get update
112117
apt-get install -y "$HCNAME"
113118
mkdir -p "$HOME/.ghcup/bin"
114119
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
115120
chmod a+x "$HOME/.ghcup/bin/ghcup"
116-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
121+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
122+
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
117123
fi
118124
env:
119125
HCKIND: ${{ matrix.compilerKind }}
@@ -131,20 +137,20 @@ jobs:
131137
echo "HC=$HC" >> "$GITHUB_ENV"
132138
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
133139
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
134-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
140+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
135141
else
136142
HC=$HCDIR/bin/$HCKIND
137143
echo "HC=$HC" >> "$GITHUB_ENV"
138144
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
139145
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
140-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
146+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
141147
fi
142148
143149
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
144150
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
145151
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
146152
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
147-
if [ $((HCNUMVER > 90401)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
153+
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
148154
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
149155
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
150156
env:
@@ -208,7 +214,7 @@ jobs:
208214
chmod a+x $HOME/.cabal/bin/cabal-plan
209215
cabal-plan --version
210216
- name: checkout
211-
uses: actions/checkout@v2
217+
uses: actions/checkout@v3
212218
with:
213219
path: source
214220
- name: initial cabal.project for sdist
@@ -282,8 +288,8 @@ jobs:
282288
run: |
283289
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
284290
cabal-plan
285-
- name: cache
286-
uses: actions/cache@v2
291+
- name: restore cache
292+
uses: actions/cache/restore@v3
287293
with:
288294
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
289295
path: ~/.cabal/store
@@ -319,7 +325,7 @@ jobs:
319325
${CABAL} -vnormal check
320326
- name: haddock
321327
run: |
322-
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
328+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
323329
- name: unconstrained build
324330
run: |
325331
rm -f cabal.project.local
@@ -331,3 +337,9 @@ jobs:
331337
run: |
332338
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' --dependencies-only -j2 all ; fi
333339
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' all ; fi
340+
- name: save cache
341+
uses: actions/cache/save@v3
342+
if: always()
343+
with:
344+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
345+
path: ~/.cabal/store

‎example-client/example-client.cabal

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,20 @@ build-type: Simple
1212
cabal-version: >=1.10
1313

1414
tested-with:
15-
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
16-
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
17-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
15+
GHC == 9.6.0
16+
GHC == 9.4.4
17+
GHC == 9.2.6
18+
GHC == 9.0.2
19+
GHC == 8.10.7
20+
GHC == 8.8.4
21+
GHC == 8.6.5
22+
GHC == 8.4.4
23+
GHC == 8.2.2
24+
GHC == 8.0.2
25+
GHC == 7.10.3
26+
GHC == 7.8.4
27+
GHC == 7.6.3
28+
GHC == 7.4.2
1829

1930
flag use-network-uri
2031
description: Are we using network-uri?

‎hackage-repo-tool/hackage-repo-tool.cabal

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,20 @@ homepage: https://github.com/haskell/hackage-security
2323
bug-reports: https://github.com/haskell/hackage-security/issues
2424

2525
tested-with:
26-
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
27-
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
28-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
26+
GHC == 9.6.0
27+
GHC == 9.4.4
28+
GHC == 9.2.6
29+
GHC == 9.0.2
30+
GHC == 8.10.7
31+
GHC == 8.8.4
32+
GHC == 8.6.5
33+
GHC == 8.4.4
34+
GHC == 8.2.2
35+
GHC == 8.0.2
36+
GHC == 7.10.3
37+
GHC == 7.8.4
38+
GHC == 7.6.3
39+
GHC == 7.4.2
2940

3041
extra-source-files:
3142
ChangeLog.md README.md

‎hackage-root-tool/hackage-root-tool.cabal

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,20 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19-
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
20-
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
21-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
19+
GHC == 9.6.0
20+
GHC == 9.4.4
21+
GHC == 9.2.6
22+
GHC == 9.0.2
23+
GHC == 8.10.7
24+
GHC == 8.8.4
25+
GHC == 8.6.5
26+
GHC == 8.4.4
27+
GHC == 8.2.2
28+
GHC == 8.0.2
29+
GHC == 7.10.3
30+
GHC == 7.8.4
31+
GHC == 7.6.3
32+
GHC == 7.4.2
2233

2334
extra-source-files:
2435
ChangeLog.md

‎hackage-security-HTTP/hackage-security-HTTP.cabal

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,20 @@ bug-reports: https://github.com/haskell/hackage-security/issues
1818
build-type: Simple
1919

2020
tested-with:
21-
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
22-
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
23-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
21+
GHC == 9.6.0
22+
GHC == 9.4.4
23+
GHC == 9.2.6
24+
GHC == 9.0.2
25+
GHC == 8.10.7
26+
GHC == 8.8.4
27+
GHC == 8.6.5
28+
GHC == 8.4.4
29+
GHC == 8.2.2
30+
GHC == 8.0.2
31+
GHC == 7.10.3
32+
GHC == 7.8.4
33+
GHC == 7.6.3
34+
GHC == 7.4.2
2435

2536
extra-source-files:
2637
ChangeLog.md

‎hackage-security-curl/hackage-security-curl.cabal

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,20 @@ build-type: Simple
1616
cabal-version: >=1.10
1717

1818
tested-with:
19-
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
20-
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
21-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
19+
GHC == 9.6.0
20+
GHC == 9.4.4
21+
GHC == 9.2.6
22+
GHC == 9.0.2
23+
GHC == 8.10.7
24+
GHC == 8.8.4
25+
GHC == 8.6.5
26+
GHC == 8.4.4
27+
GHC == 8.2.2
28+
GHC == 8.0.2
29+
GHC == 7.10.3
30+
GHC == 7.8.4
31+
GHC == 7.6.3
32+
GHC == 7.4.2
2233

2334
flag use-network-uri
2435
description: Are we using network-uri?

‎hackage-security-http-client/hackage-security-http-client.cabal

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,20 @@ build-type: Simple
1515
cabal-version: >=1.10
1616

1717
tested-with:
18-
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
19-
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
20-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
18+
GHC == 9.6.0
19+
GHC == 9.4.4
20+
GHC == 9.2.6
21+
GHC == 9.0.2
22+
GHC == 8.10.7
23+
GHC == 8.8.4
24+
GHC == 8.6.5
25+
GHC == 8.4.4
26+
GHC == 8.2.2
27+
GHC == 8.0.2
28+
GHC == 7.10.3
29+
GHC == 7.8.4
30+
GHC == 7.6.3
31+
GHC == 7.4.2
2132

2233
flag use-network-uri
2334
description: Are we using network-uri?

‎hackage-security/hackage-security.cabal

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,20 @@ bug-reports: https://github.com/haskell/hackage-security/issues
3131
build-type: Simple
3232

3333
tested-with:
34-
GHC==9.4.1, GHC==9.2.4, GHC==9.0.2,
35-
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
36-
GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2
34+
GHC == 9.6.0
35+
GHC == 9.4.4
36+
GHC == 9.2.6
37+
GHC == 9.0.2
38+
GHC == 8.10.7
39+
GHC == 8.8.4
40+
GHC == 8.6.5
41+
GHC == 8.4.4
42+
GHC == 8.2.2
43+
GHC == 8.0.2
44+
GHC == 7.10.3
45+
GHC == 7.8.4
46+
GHC == 7.6.3
47+
GHC == 7.4.2
3748

3849
extra-source-files:
3950
ChangeLog.md

0 commit comments

Comments
 (0)