Skip to content

Commit 693a7f8

Browse files
andreasabelandreasabel
committed
Bump CI to GHC 9.6.1 alpha2, 9.4.4 and 9.2.6
1 parent 0dc80f5 commit 693a7f8

File tree

3 files changed

+36
-24
lines changed

3 files changed

+36
-24
lines changed

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

Lines changed: 31 additions & 19 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.20230211
1212
#
13-
# REGENDATA ("0.15.20220710",["github","regex-tdfa.cabal"])
13+
# REGENDATA ("0.15.20230211",["github","regex-tdfa.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.6
46+
compilerKind: ghc
47+
compilerVersion: 9.2.6
4348
setup-method: ghcup
4449
allow-failure: false
4550
- compiler: ghc-9.0.2
@@ -105,19 +110,20 @@ jobs:
105110
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
106111
if [ "${{ matrix.setup-method }}" = ghcup ]; then
107112
mkdir -p "$HOME/.ghcup/bin"
108-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
113+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
109114
chmod a+x "$HOME/.ghcup/bin/ghcup"
110115
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
111116
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
112-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
117+
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
113118
else
114119
apt-add-repository -y 'ppa:hvr/ghc'
115120
apt-get update
116121
apt-get install -y "$HCNAME"
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"
120-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
125+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
126+
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
121127
fi
122128
env:
123129
HCKIND: ${{ matrix.compilerKind }}
@@ -135,20 +141,20 @@ jobs:
135141
echo "HC=$HC" >> "$GITHUB_ENV"
136142
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
137143
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
138-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
144+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
139145
else
140146
HC=$HCDIR/bin/$HCKIND
141147
echo "HC=$HC" >> "$GITHUB_ENV"
142148
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
143149
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
144-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
150+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
145151
fi
146152
147153
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
148154
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
149-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90400)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
155+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90600)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
150156
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
151-
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
157+
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
152158
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
153159
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
154160
env:
@@ -212,7 +218,7 @@ jobs:
212218
chmod a+x $HOME/.cabal/bin/cabal-plan
213219
cabal-plan --version
214220
- name: checkout
215-
uses: actions/checkout@v2
221+
uses: actions/checkout@v3
216222
with:
217223
path: source
218224
- name: initial cabal.project for sdist
@@ -250,8 +256,8 @@ jobs:
250256
run: |
251257
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
252258
cabal-plan
253-
- name: cache
254-
uses: actions/cache@v2
259+
- name: restore cache
260+
uses: actions/cache/restore@v3
255261
with:
256262
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
257263
path: ~/.cabal/store
@@ -268,14 +274,14 @@ jobs:
268274
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
269275
- name: tests
270276
run: |
271-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi
277+
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct ; fi
272278
- name: cabal check
273279
run: |
274280
cd ${PKGDIR_regex_tdfa} || false
275281
${CABAL} -vnormal check
276282
- name: haddock
277283
run: |
278-
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
284+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
279285
- name: unconstrained build
280286
run: |
281287
rm -f cabal.project.local
@@ -287,3 +293,9 @@ jobs:
287293
run: |
288294
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='mtl >= 2.3' --constraint='transformers >= 0.6' --dependencies-only -j2 all ; fi
289295
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='mtl >= 2.3' --constraint='transformers >= 0.6' all ; fi
296+
- name: save cache
297+
uses: actions/cache/save@v3
298+
if: always()
299+
with:
300+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
301+
path: ~/.cabal/store

‎cabal.haskell-ci‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ constraint-set mtl-2.3
77
constraints: mtl >= 2.3, transformers >= 0.6
88

99
-- doctest-parallel requires base >= 4.10
10-
-- and does not support GHC 9.4 as of 2022-07-16
11-
-- <https://github.com/martijnbastiaan/doctest-parallel/issues/42>
12-
tests: >= 8.2 && < 9.4
10+
-- and does not support GHC 9.6 as of 2023-02-18
11+
tests: >= 8.2 && < 9.6

‎regex-tdfa.cabal‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ extra-source-files:
2525
test/cases/*.txt
2626

2727
tested-with:
28-
GHC == 9.4.1
29-
GHC == 9.2.3
28+
GHC == 9.6.0
29+
GHC == 9.4.4
30+
GHC == 9.2.6
3031
GHC == 9.0.2
3132
GHC == 8.10.7
3233
GHC == 8.8.4

0 commit comments

Comments
 (0)