Skip to content

Commit ef75ba1

Browse files
maksbotanmaksbotan
authored
Merge pull request #106 from haskell-servant/maksbotan/ghc-9.4.5-9.2.7
Update haskell-ci, add newer GHC versions
2 parents 2980a26 + 9c890fe commit ef75ba1

File tree

7 files changed

+44
-48
lines changed

7 files changed

+44
-48
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 28 additions & 27 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.3
1212
#
13-
# REGENDATA ("0.14.3",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.16.3",["github","--config=cabal.haskell-ci","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,14 +32,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.4.3
35+
- compiler: ghc-9.4.5
3636
compilerKind: ghc
37-
compilerVersion: 9.4.3
37+
compilerVersion: 9.4.5
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.2.5
40+
- compiler: ghc-9.2.7
4141
compilerKind: ghc
42-
compilerVersion: 9.2.5
42+
compilerVersion: 9.2.7
4343
setup-method: ghcup
4444
allow-failure: false
4545
- compiler: ghc-9.0.2
@@ -57,11 +57,6 @@ jobs:
5757
compilerVersion: 8.8.4
5858
setup-method: hvr-ppa
5959
allow-failure: false
60-
- compiler: ghc-8.6.5
61-
compilerKind: ghc
62-
compilerVersion: 8.6.5
63-
setup-method: hvr-ppa
64-
allow-failure: false
6560
fail-fast: false
6661
steps:
6762
- name: apt
@@ -70,18 +65,18 @@ jobs:
7065
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
7166
if [ "${{ matrix.setup-method }}" = ghcup ]; then
7267
mkdir -p "$HOME/.ghcup/bin"
73-
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"
7469
chmod a+x "$HOME/.ghcup/bin/ghcup"
75-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
76-
"$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)
7772
else
7873
apt-add-repository -y 'ppa:hvr/ghc'
7974
apt-get update
8075
apt-get install -y "$HCNAME"
8176
mkdir -p "$HOME/.ghcup/bin"
82-
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"
8378
chmod a+x "$HOME/.ghcup/bin/ghcup"
84-
"$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)
8580
fi
8681
env:
8782
HCKIND: ${{ matrix.compilerKind }}
@@ -99,13 +94,13 @@ jobs:
9994
echo "HC=$HC" >> "$GITHUB_ENV"
10095
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
10196
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
102-
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"
10398
else
10499
HC=$HCDIR/bin/$HCKIND
105100
echo "HC=$HC" >> "$GITHUB_ENV"
106101
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
107102
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
108-
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"
109104
fi
110105
111106
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -157,14 +152,14 @@ jobs:
157152
- name: install cabal-plan
158153
run: |
159154
mkdir -p $HOME/.cabal/bin
160-
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
161-
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 -
162157
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
163158
rm -f cabal-plan.xz
164159
chmod a+x $HOME/.cabal/bin/cabal-plan
165160
cabal-plan --version
166161
- name: checkout
167-
uses: actions/checkout@v2
162+
uses: actions/checkout@v3
168163
with:
169164
path: source
170165
- name: initial cabal.project for sdist
@@ -223,8 +218,8 @@ jobs:
223218
run: |
224219
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
225220
cabal-plan
226-
- name: cache
227-
uses: actions/cache@v2
221+
- name: restore cache
222+
uses: actions/cache/restore@v3
228223
with:
229224
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
230225
path: ~/.cabal/store
@@ -253,7 +248,7 @@ jobs:
253248
${CABAL} -vnormal check
254249
- name: haddock
255250
run: |
256-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
251+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
257252
- name: unconstrained build
258253
run: |
259254
rm -f cabal.project.local
@@ -267,8 +262,8 @@ jobs:
267262
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all
268263
- name: constraint set servant-0.18
269264
run: |
270-
if [ $((HCNUMVER < 90002)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
271-
if [ $((HCNUMVER < 90002)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
265+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
266+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
272267
- name: constraint set servant-0.17
273268
run: |
274269
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi
@@ -277,3 +272,9 @@ jobs:
277272
run: |
278273
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' --dependencies-only -j2 all ; fi
279274
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
275+
- name: save cache
276+
uses: actions/cache/save@v3
277+
if: always()
278+
with:
279+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
280+
path: ~/.cabal/store

‎cabal.haskell-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ constraint-set servant-0.17
99
constraints: servant ==0.17.*
1010

1111
constraint-set servant-0.18
12-
ghc: >= 8.6 && <9.2
12+
ghc: >= 8.6 && <9.0
1313
constraints: servant ==0.18.*
1414

1515
constraint-set servant-0.19

‎servant-swagger-ui-core/servant-swagger-ui-core.cabal

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ license: BSD3
1919
license-file: LICENSE
2020
build-type: Simple
2121
tested-with:
22-
GHC ==8.6.5
23-
|| ==8.8.4
22+
GHC ==8.8.4
2423
|| ==8.10.7
2524
|| ==9.0.2
26-
|| ==9.2.5
27-
|| ==9.4.3
25+
|| ==9.2.7
26+
|| ==9.4.5
2827

2928
extra-source-files: Changelog.md
3029

‎servant-swagger-ui-example/servant-swagger-ui-example.cabal

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ license: BSD3
1414
license-file: LICENSE
1515
build-type: Simple
1616
tested-with:
17-
GHC ==8.6.5
18-
|| ==8.8.4
17+
GHC ==8.8.4
1918
|| ==8.10.7
2019
|| ==9.0.2
21-
|| ==9.2.5
22-
|| ==9.4.3
20+
|| ==9.2.7
21+
|| ==9.4.5
2322

2423
source-repository head
2524
type: git

‎servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ license: BSD3
1818
license-file: LICENSE
1919
build-type: Simple
2020
tested-with:
21-
GHC ==8.6.5
22-
|| ==8.8.4
21+
GHC ==8.8.4
2322
|| ==8.10.7
2423
|| ==9.0.2
25-
|| ==9.2.5
26-
|| ==9.4.3
24+
|| ==9.2.7
25+
|| ==9.4.5
2726

2827
extra-source-files:
2928
jensoleg.index.html.tmpl

‎servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ license: BSD3
1818
license-file: LICENSE
1919
build-type: Simple
2020
tested-with:
21-
GHC ==8.6.5
22-
|| ==8.8.4
21+
GHC ==8.8.4
2322
|| ==8.10.7
2423
|| ==9.0.2
25-
|| ==9.2.5
26-
|| ==9.4.3
24+
|| ==9.2.7
25+
|| ==9.4.5
2726

2827
extra-source-files:
2928
redoc-dist-1.22.3/redoc.min.js

‎servant-swagger-ui/servant-swagger-ui.cabal

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ license: BSD3
1818
license-file: LICENSE
1919
build-type: Simple
2020
tested-with:
21-
GHC ==8.6.5
22-
|| ==8.8.4
21+
GHC ==8.8.4
2322
|| ==8.10.7
2423
|| ==9.0.2
25-
|| ==9.2.5
26-
|| ==9.4.3
24+
|| ==9.2.7
25+
|| ==9.4.5
2726

2827
extra-source-files:
2928
CHANGELOG.md

0 commit comments

Comments
 (0)