Skip to content
This repository was archived by the owner on Jul 25, 2022. It is now read-only.

Commit 092dd89

Browse files
committed
Bump CI to GHC 9.6.0, 9.4.4 and 9.2.5
1 parent dabb2ec commit 092dd89

File tree

2 files changed

+32
-19
lines changed

2 files changed

+32
-19
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 29 additions & 17 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.20220710
11+
# version: 0.15.20230203
1212
#
13-
# REGENDATA ("0.15.20220710",["github","ini.cabal"])
13+
# REGENDATA ("0.15.20230203",["github","ini.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.4.0.20220623
35+
- compiler: ghc-9.6.0.20230128
3636
compilerKind: ghc
37-
compilerVersion: 9.4.0.20220623
37+
compilerVersion: 9.6.0.20230128
3838
setup-method: ghcup
3939
allow-failure: true
40-
- compiler: ghc-9.2.3
40+
- compiler: ghc-9.4.4
4141
compilerKind: ghc
42-
compilerVersion: 9.2.3
42+
compilerVersion: 9.4.4
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.2.5
46+
compilerKind: ghc
47+
compilerVersion: 9.2.5
4348
setup-method: ghcup
4449
allow-failure: false
4550
- compiler: ghc-9.0.2
@@ -115,19 +120,20 @@ jobs:
115120
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
116121
if [ "${{ matrix.setup-method }}" = ghcup ]; then
117122
mkdir -p "$HOME/.ghcup/bin"
118-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
123+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
119124
chmod a+x "$HOME/.ghcup/bin/ghcup"
120125
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
121126
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
122-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
127+
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
123128
else
124129
apt-add-repository -y 'ppa:hvr/ghc'
125130
apt-get update
126131
apt-get install -y "$HCNAME"
127132
mkdir -p "$HOME/.ghcup/bin"
128-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
133+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
129134
chmod a+x "$HOME/.ghcup/bin/ghcup"
130-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
135+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
136+
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
131137
fi
132138
env:
133139
HCKIND: ${{ matrix.compilerKind }}
@@ -145,20 +151,20 @@ jobs:
145151
echo "HC=$HC" >> "$GITHUB_ENV"
146152
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
147153
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
148-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
154+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
149155
else
150156
HC=$HCDIR/bin/$HCKIND
151157
echo "HC=$HC" >> "$GITHUB_ENV"
152158
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
153159
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
154-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
160+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
155161
fi
156162
157163
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
158164
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
159165
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
160166
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
161-
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
167+
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
162168
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
163169
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
164170
env:
@@ -222,7 +228,7 @@ jobs:
222228
chmod a+x $HOME/.cabal/bin/cabal-plan
223229
cabal-plan --version
224230
- name: checkout
225-
uses: actions/checkout@v2
231+
uses: actions/checkout@v3
226232
with:
227233
path: source
228234
- name: initial cabal.project for sdist
@@ -260,8 +266,8 @@ jobs:
260266
run: |
261267
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
262268
cabal-plan
263-
- name: cache
264-
uses: actions/cache@v2
269+
- name: restore cache
270+
uses: actions/cache/restore@v3
265271
with:
266272
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
267273
path: ~/.cabal/store
@@ -285,8 +291,14 @@ jobs:
285291
${CABAL} -vnormal check
286292
- name: haddock
287293
run: |
288-
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
294+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
289295
- name: unconstrained build
290296
run: |
291297
rm -f cabal.project.local
292298
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
299+
- name: save cache
300+
uses: actions/cache/save@v3
301+
if: always()
302+
with:
303+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
304+
path: ~/.cabal/store

ini.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ category: Data, Configuration
1414
build-type: Simple
1515

1616
tested-with:
17-
GHC == 9.4.1
18-
GHC == 9.2.3
17+
GHC == 9.6.0
18+
GHC == 9.4.4
19+
GHC == 9.2.5
1920
GHC == 9.0.2
2021
GHC == 8.10.7
2122
GHC == 8.8.4

0 commit comments

Comments
 (0)