Skip to content

Commit 0bee200

Browse files
authored
Use haskell-ci v0.16 (#66)
1 parent fbc3eb6 commit 0bee200

File tree

4 files changed

+27
-21
lines changed

4 files changed

+27
-21
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 24 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.14.3
11+
# version: 0.16
1212
#
13-
# REGENDATA ("0.14.3",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
13+
# REGENDATA ("0.16",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
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,9 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.2.2
35+
- compiler: ghc-9.2.7
3636
compilerKind: ghc
37-
compilerVersion: 9.2.2
37+
compilerVersion: 9.2.7
3838
setup-method: ghcup
3939
allow-failure: true
4040
- compiler: ghc-9.0.2
@@ -65,18 +65,18 @@ jobs:
6565
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
6666
if [ "${{ matrix.setup-method }}" = ghcup ]; then
6767
mkdir -p "$HOME/.ghcup/bin"
68-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
68+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
6969
chmod a+x "$HOME/.ghcup/bin/ghcup"
70-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
71-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
70+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
71+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
7272
else
7373
apt-add-repository -y 'ppa:hvr/ghc'
7474
apt-get update
7575
apt-get install -y "$HCNAME"
7676
mkdir -p "$HOME/.ghcup/bin"
77-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
77+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
7878
chmod a+x "$HOME/.ghcup/bin/ghcup"
79-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
79+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8080
fi
8181
env:
8282
HCKIND: ${{ matrix.compilerKind }}
@@ -94,13 +94,13 @@ jobs:
9494
echo "HC=$HC" >> "$GITHUB_ENV"
9595
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
9696
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
97-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
97+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9898
else
9999
HC=$HCDIR/bin/$HCKIND
100100
echo "HC=$HC" >> "$GITHUB_ENV"
101101
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
102102
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
103-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
103+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
104104
fi
105105
106106
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -152,14 +152,14 @@ jobs:
152152
- name: install cabal-plan
153153
run: |
154154
mkdir -p $HOME/.cabal/bin
155-
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
156-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
155+
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
156+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
157157
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
158158
rm -f cabal-plan.xz
159159
chmod a+x $HOME/.cabal/bin/cabal-plan
160160
cabal-plan --version
161161
- name: checkout
162-
uses: actions/checkout@v2
162+
uses: actions/checkout@v3
163163
with:
164164
path: source
165165
- name: initial cabal.project for sdist
@@ -206,8 +206,8 @@ jobs:
206206
run: |
207207
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
208208
cabal-plan
209-
- name: cache
210-
uses: actions/cache@v2
209+
- name: restore cache
210+
uses: actions/cache/restore@v3
211211
with:
212212
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
213213
path: ~/.cabal/store
@@ -235,7 +235,7 @@ jobs:
235235
${CABAL} -vnormal check
236236
- name: haddock
237237
run: |
238-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
238+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
239239
- name: unconstrained build
240240
run: |
241241
rm -f cabal.project.local
@@ -255,3 +255,9 @@ jobs:
255255
run: |
256256
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi
257257
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
258+
- name: save cache
259+
uses: actions/cache/save@v3
260+
if: always()
261+
with:
262+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
263+
path: ~/.cabal/store

servant-multipart-api/servant-multipart-api.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tested-with:
2020
|| ==8.8.4
2121
|| ==8.10.7
2222
|| ==9.0.2
23-
|| ==9.2.2
23+
|| ==9.2.7
2424

2525
library
2626
default-language: Haskell2010

servant-multipart-client/servant-multipart-client.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tested-with:
1919
|| ==8.8.4
2020
|| ==8.10.7
2121
|| ==9.0.2
22-
|| ==9.2.2
22+
|| ==9.2.7
2323

2424
library
2525
default-language: Haskell2010

servant-multipart/servant-multipart.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tested-with:
1919
|| ==8.8.4
2020
|| ==8.10.7
2121
|| ==9.0.2
22-
|| ==9.2.2
22+
|| ==9.2.7
2323

2424
library
2525
default-language: Haskell2010

0 commit comments

Comments
 (0)