Skip to content

Commit

Permalink
Merge pull request #41 from biocad/maksbotan/ghc-9.2.2
Browse files Browse the repository at this point in the history
Add GHC 9.2.2 CI
  • Loading branch information
maksbotan authored Mar 13, 2022
2 parents f87e8b6 + bf07e06 commit a7b3b44
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.14
# version: 0.14.3
#
# REGENDATA ("0.14",["github","cabal.project"])
# REGENDATA ("0.14.3",["github","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -32,9 +32,9 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.2.1
- compiler: ghc-9.2.2
compilerKind: ghc
compilerVersion: 9.2.1
compilerVersion: 9.2.2
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.0.2
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
if [ "${{ matrix.setup-method }}" = ghcup ]; then
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
Expand All @@ -79,7 +79,7 @@ jobs:
apt-get update
apt-get install -y "$HCNAME"
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
fi
Expand Down Expand Up @@ -239,5 +239,5 @@ jobs:
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson >=2.0' all
- name: constraint set aeson-1
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson <2.0' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson <2.0' all
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson <2.0' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='aeson <2.0' all ; fi
4 changes: 4 additions & 0 deletions cabal.haskell-ci
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
branches: master

distribution: focal
allow-failures: >=9.2

constraint-set aeson-1
constraints: aeson <2.0
ghc: <9.2

constraint-set aeson-2
constraints: aeson >=2.0
2 changes: 1 addition & 1 deletion openapi3.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ tested-with:
|| ==8.8.4
|| ==8.10.7
|| ==9.0.2
|| ==9.2.1
|| ==9.2.2

custom-setup
setup-depends:
Expand Down

0 comments on commit a7b3b44

Please sign in to comment.