Skip to content

Commit bbaf5e1

Browse files
committed
CI: Test up to GHC 9.8.1
1 parent 08277bd commit bbaf5e1

File tree

2 files changed

+45
-19
lines changed

2 files changed

+45
-19
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 42 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.14.3
11+
# version: 0.17.20240109
1212
#
13-
# REGENDATA ("0.14.3",["github","cabal.project"])
13+
# REGENDATA ("0.17.20240109",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-18.04
22+
runs-on: ubuntu-20.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -28,6 +28,21 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31+
- compiler: ghc-9.8.1
32+
compilerKind: ghc
33+
compilerVersion: 9.8.1
34+
setup-method: ghcup
35+
allow-failure: false
36+
- compiler: ghc-9.6.4
37+
compilerKind: ghc
38+
compilerVersion: 9.6.4
39+
setup-method: ghcup
40+
allow-failure: false
41+
- compiler: ghc-9.4.8
42+
compilerKind: ghc
43+
compilerVersion: 9.4.8
44+
setup-method: ghcup
45+
allow-failure: false
3146
- compiler: ghc-9.2.2
3247
compilerKind: ghc
3348
compilerVersion: 9.2.2
@@ -61,18 +76,18 @@ jobs:
6176
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
6277
if [ "${{ matrix.setup-method }}" = ghcup ]; then
6378
mkdir -p "$HOME/.ghcup/bin"
64-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
79+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
6580
chmod a+x "$HOME/.ghcup/bin/ghcup"
66-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
67-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
81+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
82+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
6883
else
6984
apt-add-repository -y 'ppa:hvr/ghc'
7085
apt-get update
7186
apt-get install -y "$HCNAME"
7287
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"
88+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
7489
chmod a+x "$HOME/.ghcup/bin/ghcup"
75-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
90+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
7691
fi
7792
env:
7893
HCKIND: ${{ matrix.compilerKind }}
@@ -86,17 +101,19 @@ jobs:
86101
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
87102
HCDIR=/opt/$HCKIND/$HCVER
88103
if [ "${{ matrix.setup-method }}" = ghcup ]; then
89-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
104+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
105+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
106+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
90107
echo "HC=$HC" >> "$GITHUB_ENV"
91-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
92-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
93-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
108+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
109+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
110+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
94111
else
95112
HC=$HCDIR/bin/$HCKIND
96113
echo "HC=$HC" >> "$GITHUB_ENV"
97114
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
98115
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
99-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
116+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
100117
fi
101118
102119
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -148,14 +165,14 @@ jobs:
148165
- name: install cabal-plan
149166
run: |
150167
mkdir -p $HOME/.cabal/bin
151-
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
152-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
168+
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
169+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
153170
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
154171
rm -f cabal-plan.xz
155172
chmod a+x $HOME/.cabal/bin/cabal-plan
156173
cabal-plan --version
157174
- name: checkout
158-
uses: actions/checkout@v2
175+
uses: actions/checkout@v3
159176
with:
160177
path: source
161178
- name: initial cabal.project for sdist
@@ -192,8 +209,8 @@ jobs:
192209
run: |
193210
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
194211
cabal-plan
195-
- name: cache
196-
uses: actions/cache@v2
212+
- name: restore cache
213+
uses: actions/cache/restore@v3
197214
with:
198215
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
199216
path: ~/.cabal/store
@@ -211,4 +228,10 @@ jobs:
211228
${CABAL} -vnormal check
212229
- name: haddock
213230
run: |
214-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
231+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
232+
- name: save cache
233+
uses: actions/cache/save@v3
234+
if: always()
235+
with:
236+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
237+
path: ~/.cabal/store

language-bluespec.cabal

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ tested-with: GHC == 8.6.5
3131
, GHC == 8.10.7
3232
, GHC == 9.0.2
3333
, GHC == 9.2.2
34+
, GHC == 9.4.8
35+
, GHC == 9.6.4
36+
, GHC == 9.8.1
3437

3538
source-repository head
3639
type: git

0 commit comments

Comments
 (0)