Skip to content

Commit 8de8ede

Browse files
andreasabelandreasabel
committed
Bump CI to latest GHC minors: 9.6.2 9.4.5 9.2.8
1 parent 482bc5a commit 8de8ede

File tree

8 files changed

+39
-39
lines changed

8 files changed

+39
-39
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 18 additions & 18 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.20230217
11+
# version: 0.16.4
1212
#
13-
# REGENDATA ("0.15.20230217",["github","cabal.project"])
13+
# REGENDATA ("0.16.4",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -34,19 +34,19 @@ jobs:
3434
strategy:
3535
matrix:
3636
include:
37-
- compiler: ghc-9.6.0.20230210
37+
- compiler: ghc-9.6.2
3838
compilerKind: ghc
39-
compilerVersion: 9.6.0.20230210
39+
compilerVersion: 9.6.2
4040
setup-method: ghcup
41-
allow-failure: true
42-
- compiler: ghc-9.4.4
41+
allow-failure: false
42+
- compiler: ghc-9.4.5
4343
compilerKind: ghc
44-
compilerVersion: 9.4.4
44+
compilerVersion: 9.4.5
4545
setup-method: ghcup
4646
allow-failure: false
47-
- compiler: ghc-9.2.6
47+
- compiler: ghc-9.2.8
4848
compilerKind: ghc
49-
compilerVersion: 9.2.6
49+
compilerVersion: 9.2.8
5050
setup-method: ghcup
5151
allow-failure: false
5252
- compiler: ghc-9.0.2
@@ -112,20 +112,20 @@ jobs:
112112
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
113113
if [ "${{ matrix.setup-method }}" = ghcup ]; then
114114
mkdir -p "$HOME/.ghcup/bin"
115-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
115+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
116116
chmod a+x "$HOME/.ghcup/bin/ghcup"
117117
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
118118
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
119-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
119+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
120120
else
121121
apt-add-repository -y 'ppa:hvr/ghc'
122122
apt-get update
123123
apt-get install -y "$HCNAME"
124124
mkdir -p "$HOME/.ghcup/bin"
125-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
125+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
126126
chmod a+x "$HOME/.ghcup/bin/ghcup"
127127
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
128-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
128+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
129129
fi
130130
env:
131131
HCKIND: ${{ matrix.compilerKind }}
@@ -143,20 +143,20 @@ jobs:
143143
echo "HC=$HC" >> "$GITHUB_ENV"
144144
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
145145
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
146-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
146+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
147147
else
148148
HC=$HCDIR/bin/$HCKIND
149149
echo "HC=$HC" >> "$GITHUB_ENV"
150150
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
151151
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
152-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
152+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
153153
fi
154154
155155
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
156156
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
157157
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
158158
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
159-
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
159+
if [ $((HCNUMVER > 90602)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
160160
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
161161
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
162162
env:
@@ -213,8 +213,8 @@ jobs:
213213
- name: install cabal-plan
214214
run: |
215215
mkdir -p $HOME/.cabal/bin
216-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
217-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
216+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
217+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
218218
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
219219
rm -f cabal-plan.xz
220220
chmod a+x $HOME/.cabal/bin/cabal-plan

‎example-client/example-client.cabal

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

1414
tested-with:
15-
GHC == 9.6.0
16-
GHC == 9.4.4
17-
GHC == 9.2.6
15+
GHC == 9.6.2
16+
GHC == 9.4.5
17+
GHC == 9.2.8
1818
GHC == 9.0.2
1919
GHC == 8.10.7
2020
GHC == 8.8.4

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

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

2626
tested-with:
27-
GHC == 9.6.0
28-
GHC == 9.4.4
29-
GHC == 9.2.6
27+
GHC == 9.6.2
28+
GHC == 9.4.5
29+
GHC == 9.2.8
3030
GHC == 9.0.2
3131
GHC == 8.10.7
3232
GHC == 8.8.4

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

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

1818
tested-with:
19-
GHC == 9.6.0
20-
GHC == 9.4.4
21-
GHC == 9.2.6
19+
GHC == 9.6.2
20+
GHC == 9.4.5
21+
GHC == 9.2.8
2222
GHC == 9.0.2
2323
GHC == 8.10.7
2424
GHC == 8.8.4

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

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

2020
tested-with:
21-
GHC == 9.6.0
22-
GHC == 9.4.4
23-
GHC == 9.2.6
21+
GHC == 9.6.2
22+
GHC == 9.4.5
23+
GHC == 9.2.8
2424
GHC == 9.0.2
2525
GHC == 8.10.7
2626
GHC == 8.8.4

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

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

1818
tested-with:
19-
GHC == 9.6.0
20-
GHC == 9.4.4
21-
GHC == 9.2.6
19+
GHC == 9.6.2
20+
GHC == 9.4.5
21+
GHC == 9.2.8
2222
GHC == 9.0.2
2323
GHC == 8.10.7
2424
GHC == 8.8.4

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

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

1717
tested-with:
18-
GHC == 9.6.0
19-
GHC == 9.4.4
20-
GHC == 9.2.6
18+
GHC == 9.6.2
19+
GHC == 9.4.5
20+
GHC == 9.2.8
2121
GHC == 9.0.2
2222
GHC == 8.10.7
2323
GHC == 8.8.4

‎hackage-security/hackage-security.cabal

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

3434
tested-with:
35-
GHC == 9.6.0
36-
GHC == 9.4.4
37-
GHC == 9.2.6
35+
GHC == 9.6.2
36+
GHC == 9.4.5
37+
GHC == 9.2.8
3838
GHC == 9.0.2
3939
GHC == 8.10.7
4040
GHC == 8.8.4

0 commit comments

Comments
 (0)