Skip to content

Commit a7b3b44

Browse files
authored
Merge pull request #41 from biocad/maksbotan/ghc-9.2.2
Add GHC 9.2.2 CI
2 parents f87e8b6 + bf07e06 commit a7b3b44

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 8 additions & 8 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
11+
# version: 0.14.3
1212
#
13-
# REGENDATA ("0.14",["github","cabal.project"])
13+
# REGENDATA ("0.14.3",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,9 +32,9 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.2.1
35+
- compiler: ghc-9.2.2
3636
compilerKind: ghc
37-
compilerVersion: 9.2.1
37+
compilerVersion: 9.2.2
3838
setup-method: ghcup
3939
allow-failure: true
4040
- compiler: ghc-9.0.2
@@ -70,7 +70,7 @@ jobs:
7070
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
7171
if [ "${{ matrix.setup-method }}" = ghcup ]; then
7272
mkdir -p "$HOME/.ghcup/bin"
73-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
73+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
7474
chmod a+x "$HOME/.ghcup/bin/ghcup"
7575
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
7676
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
@@ -79,7 +79,7 @@ jobs:
7979
apt-get update
8080
apt-get install -y "$HCNAME"
8181
mkdir -p "$HOME/.ghcup/bin"
82-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
82+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
8383
chmod a+x "$HOME/.ghcup/bin/ghcup"
8484
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
8585
fi
@@ -239,5 +239,5 @@ jobs:
239239
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson >=2.0' all
240240
- name: constraint set aeson-1
241241
run: |
242-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson <2.0' --dependencies-only -j2 all
243-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson <2.0' all
242+
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson <2.0' --dependencies-only -j2 all ; fi
243+
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson <2.0' all ; fi

cabal.haskell-ci

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
branches: master
22

3+
distribution: focal
4+
allow-failures: >=9.2
5+
36
constraint-set aeson-1
47
constraints: aeson <2.0
8+
ghc: <9.2
59

610
constraint-set aeson-2
711
constraints: aeson >=2.0

openapi3.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tested-with:
2828
|| ==8.8.4
2929
|| ==8.10.7
3030
|| ==9.0.2
31-
|| ==9.2.1
31+
|| ==9.2.2
3232

3333
custom-setup
3434
setup-depends:

0 commit comments

Comments
 (0)