Skip to content

Commit d2056cc

Browse files
andreasabelandreasabel
committed
Bump CI to ubuntu-20.04 and latest GHCs: 9.6.1 9.4.4 9.2.7
ubuntu-18.04 has reached EOL
1 parent 0816413 commit d2056cc

4 files changed

Lines changed: 61 additions & 34 deletions

File tree

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

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.14
11+
# version: 0.15.20230321
1212
#
13-
# REGENDATA ("0.14",["github","cabal.project"])
13+
# REGENDATA ("0.15.20230321",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
17-
- push
18-
- pull_request
17+
push:
18+
branches:
19+
- master
20+
- ci-*
21+
pull_request:
22+
branches:
23+
- master
24+
- ci-*
1925
jobs:
2026
linux:
2127
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-18.04
28+
runs-on: ubuntu-20.04
2329
timeout-minutes:
2430
60
2531
container:
@@ -28,9 +34,19 @@ jobs:
2834
strategy:
2935
matrix:
3036
include:
31-
- compiler: ghc-9.2.1
37+
- compiler: ghc-9.6.1
3238
compilerKind: ghc
33-
compilerVersion: 9.2.1
39+
compilerVersion: 9.6.1
40+
setup-method: ghcup
41+
allow-failure: false
42+
- compiler: ghc-9.4.4
43+
compilerKind: ghc
44+
compilerVersion: 9.4.4
45+
setup-method: ghcup
46+
allow-failure: false
47+
- compiler: ghc-9.2.7
48+
compilerKind: ghc
49+
compilerVersion: 9.2.7
3450
setup-method: ghcup
3551
allow-failure: false
3652
- compiler: ghc-9.0.2
@@ -81,18 +97,18 @@ jobs:
8197
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8298
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8399
mkdir -p "$HOME/.ghcup/bin"
84-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
100+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
85101
chmod a+x "$HOME/.ghcup/bin/ghcup"
86-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
87-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
102+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
103+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
88104
else
89105
apt-add-repository -y 'ppa:hvr/ghc'
90106
apt-get update
91107
apt-get install -y "$HCNAME"
92108
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
109+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
94110
chmod a+x "$HOME/.ghcup/bin/ghcup"
95-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
111+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
96112
fi
97113
env:
98114
HCKIND: ${{ matrix.compilerKind }}
@@ -110,13 +126,13 @@ jobs:
110126
echo "HC=$HC" >> "$GITHUB_ENV"
111127
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
112128
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
113-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
129+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114130
else
115131
HC=$HCDIR/bin/$HCKIND
116132
echo "HC=$HC" >> "$GITHUB_ENV"
117133
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
118134
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
119-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
135+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120136
fi
121137
122138
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -175,7 +191,7 @@ jobs:
175191
chmod a+x $HOME/.cabal/bin/cabal-plan
176192
cabal-plan --version
177193
- name: checkout
178-
uses: actions/checkout@v2
194+
uses: actions/checkout@v3
179195
with:
180196
path: source
181197
- name: initial cabal.project for sdist
@@ -216,8 +232,8 @@ jobs:
216232
run: |
217233
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
218234
cabal-plan
219-
- name: cache
220-
uses: actions/cache@v2
235+
- name: restore cache
236+
uses: actions/cache/restore@v3
221237
with:
222238
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
223239
path: ~/.cabal/store
@@ -240,8 +256,14 @@ jobs:
240256
${CABAL} -vnormal check
241257
- name: haddock
242258
run: |
243-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
259+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
244260
- name: unconstrained build
245261
run: |
246262
rm -f cabal.project.local
247263
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
264+
- name: save cache
265+
uses: actions/cache/save@v3
266+
if: always()
267+
with:
268+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
269+
path: ~/.cabal/store

‎cabal.haskell-ci‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
branches: master ci-*

‎language-python-test/language-python-test.cabal‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,17 @@ build-type: Simple
1414
stability: experimental
1515

1616
tested-with:
17-
GHC == 7.10.3
18-
GHC == 8.0.2
19-
GHC == 8.2.2
20-
GHC == 8.4.4
21-
GHC == 8.6.5
22-
GHC == 8.8.4
23-
GHC == 8.10.7
17+
GHC == 9.6.1
18+
GHC == 9.4.4
19+
GHC == 9.2.7
2420
GHC == 9.0.2
25-
GHC == 9.2.1
21+
GHC == 8.10.7
22+
GHC == 8.8.4
23+
GHC == 8.6.5
24+
GHC == 8.4.4
25+
GHC == 8.2.2
26+
GHC == 8.0.2
27+
GHC == 7.10.3
2628

2729
source-repository head
2830
type: git

‎language-python/language-python.cabal‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ build-type: Simple
1515
stability: experimental
1616

1717
tested-with:
18-
GHC == 7.10.3
19-
GHC == 8.0.2
20-
GHC == 8.2.2
21-
GHC == 8.4.4
22-
GHC == 8.6.5
23-
GHC == 8.8.4
24-
GHC == 8.10.7
18+
GHC == 9.6.1
19+
GHC == 9.4.4
20+
GHC == 9.2.7
2521
GHC == 9.0.2
26-
GHC == 9.2.1
22+
GHC == 8.10.7
23+
GHC == 8.8.4
24+
GHC == 8.6.5
25+
GHC == 8.4.4
26+
GHC == 8.2.2
27+
GHC == 8.0.2
28+
GHC == 7.10.3
2729

2830
source-repository head
2931
type: git

0 commit comments

Comments
 (0)