Skip to content

Commit 087ba87

Browse files
authored
Add CI with GHC 9.4.1 (#477)
* Add CI with GHC 9.4.1 * Limit haddock to GHC >= 9
1 parent 47db794 commit 087ba87

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

.github/workflows/haskell-ci.yml

+14-9
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.15.20220808
1212
#
13-
# REGENDATA ("0.14.3",["github","unordered-containers.cabal"])
13+
# REGENDATA ("0.15.20220808",["github","unordered-containers.cabal"])
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,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.2.1
35+
- compiler: ghc-9.4.1
3636
compilerKind: ghc
37-
compilerVersion: 9.2.1
37+
compilerVersion: 9.4.1
38+
setup-method: ghcup
39+
allow-failure: false
40+
- compiler: ghc-9.2.4
41+
compilerKind: ghc
42+
compilerVersion: 9.2.4
3843
setup-method: ghcup
3944
allow-failure: false
4045
- compiler: ghc-9.0.2
@@ -74,10 +79,10 @@ jobs:
7479
apt-get update
7580
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
7681
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"
82+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
7883
chmod a+x "$HOME/.ghcup/bin/ghcup"
79-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
80-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
84+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
85+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8186
env:
8287
HCKIND: ${{ matrix.compilerKind }}
8388
HCNAME: ${{ matrix.compiler }}
@@ -210,7 +215,7 @@ jobs:
210215
${CABAL} -vnormal check
211216
- name: haddock
212217
run: |
213-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
218+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
214219
- name: unconstrained build
215220
run: |
216221
rm -f cabal.project.local

cabal.haskell-ci

+4
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ installed: -binary
1212

1313
-- Avoid HVR's PPA due to outage on 2022-04-27
1414
ghcup-jobs: True
15+
16+
-- With GHC < 9, haddock fails due to a parse error in the benchmarks.
17+
-- https://github.com/haskell-CI/haskell-ci/issues/605
18+
haddock: >= 9

unordered-containers.cabal

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ cabal-version: >=1.10
2929
extra-source-files: CHANGES.md
3030

3131
tested-with:
32-
GHC ==9.2.1
32+
GHC ==9.4.1
33+
|| ==9.2.4
3334
|| ==9.0.2
3435
|| ==8.10.7
3536
|| ==8.8.4

0 commit comments

Comments
 (0)