Skip to content

Commit 4d1cd24

Browse files
authored
Merge pull request #168 from haskell/update-ci
Update CI
2 parents 1f54212 + 710f5b9 commit 4d1cd24

File tree

2 files changed

+35
-19
lines changed

2 files changed

+35
-19
lines changed

.github/workflows/haskell-ci.yml

+34-18
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.14.3
11+
# version: 0.16.5
1212
#
13-
# REGENDATA ("0.14.3",["github","cabal.project"])
13+
# REGENDATA ("0.16.5",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-18.04
26+
runs-on: ubuntu-20.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -32,9 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.2.2
35+
- compiler: ghc-9.6.2
3636
compilerKind: ghc
37-
compilerVersion: 9.2.2
37+
compilerVersion: 9.6.2
38+
setup-method: ghcup
39+
allow-failure: false
40+
- compiler: ghc-9.4.5
41+
compilerKind: ghc
42+
compilerVersion: 9.4.5
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.2.8
46+
compilerKind: ghc
47+
compilerVersion: 9.2.8
3848
setup-method: ghcup
3949
allow-failure: false
4050
- compiler: ghc-9.0.2
@@ -100,18 +110,18 @@ jobs:
100110
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
101111
if [ "${{ matrix.setup-method }}" = ghcup ]; then
102112
mkdir -p "$HOME/.ghcup/bin"
103-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
113+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
104114
chmod a+x "$HOME/.ghcup/bin/ghcup"
105-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
106-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
115+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
116+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
107117
else
108118
apt-add-repository -y 'ppa:hvr/ghc'
109119
apt-get update
110120
apt-get install -y "$HCNAME"
111121
mkdir -p "$HOME/.ghcup/bin"
112-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
122+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
113123
chmod a+x "$HOME/.ghcup/bin/ghcup"
114-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
124+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
115125
fi
116126
env:
117127
HCKIND: ${{ matrix.compilerKind }}
@@ -129,13 +139,13 @@ jobs:
129139
echo "HC=$HC" >> "$GITHUB_ENV"
130140
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
131141
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
132-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
142+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
133143
else
134144
HC=$HCDIR/bin/$HCKIND
135145
echo "HC=$HC" >> "$GITHUB_ENV"
136146
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
137147
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
138-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
148+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
139149
fi
140150
141151
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -187,14 +197,14 @@ jobs:
187197
- name: install cabal-plan
188198
run: |
189199
mkdir -p $HOME/.cabal/bin
190-
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
191-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
200+
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
201+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
192202
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
193203
rm -f cabal-plan.xz
194204
chmod a+x $HOME/.cabal/bin/cabal-plan
195205
cabal-plan --version
196206
- name: checkout
197-
uses: actions/checkout@v2
207+
uses: actions/checkout@v3
198208
with:
199209
path: source
200210
- name: initial cabal.project for sdist
@@ -229,8 +239,8 @@ jobs:
229239
run: |
230240
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
231241
cabal-plan
232-
- name: cache
233-
uses: actions/cache@v2
242+
- name: restore cache
243+
uses: actions/cache/restore@v3
234244
with:
235245
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
236246
path: ~/.cabal/store
@@ -254,7 +264,7 @@ jobs:
254264
${CABAL} -vnormal check
255265
- name: haddock
256266
run: |
257-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
267+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
258268
- name: unconstrained build
259269
run: |
260270
rm -f cabal.project.local
@@ -267,3 +277,9 @@ jobs:
267277
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='mtl ^>=2.3' --dependencies-only -j2 all ; fi
268278
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='mtl ^>=2.3' all ; fi
269279
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='mtl ^>=2.3' all ; fi
280+
- name: save cache
281+
uses: actions/cache/save@v3
282+
if: always()
283+
with:
284+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
285+
path: ~/.cabal/store

parsec.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bug-reports: https://github.com/haskell/parsec/issues
2626
category: Parsing
2727

2828
build-type: Simple
29-
tested-with: GHC ==9.2.2 || ==9.0.2 || ==8.10.7 || ==8.8.4 || ==8.6.5 || ==8.4.4 || ==8.2.2 || ==8.0.2 || ==7.10.3 || ==7.8.4 || ==7.6.3 || ==7.4.2
29+
tested-with: GHC ==9.6.2 || ==9.4.5 || ==9.2.8 || ==9.0.2 || ==8.10.7 || ==8.8.4 || ==8.6.5 || ==8.4.4 || ==8.2.2 || ==8.0.2 || ==7.10.3 || ==7.8.4 || ==7.6.3 || ==7.4.2
3030

3131
extra-source-files: ChangeLog.md, README.md
3232

0 commit comments

Comments
 (0)