Skip to content

Commit 548ac0e

Browse files
authored
Merge pull request #25 from biocad/maksbotan/ghc-9.2
Support GHC 9.2
2 parents a0cbf88 + a1a4830 commit 548ac0e

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 9 additions & 4 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","--config","cabal.haskell-ci"])
13+
# REGENDATA ("0.14.3",["github","cabal.project","--config","cabal.haskell-ci"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.2.2
36+
compilerKind: ghc
37+
compilerVersion: 9.2.2
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.0.2
3641
compilerKind: ghc
3742
compilerVersion: 9.0.2
@@ -60,7 +65,7 @@ jobs:
6065
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
6166
if [ "${{ matrix.setup-method }}" = ghcup ]; then
6267
mkdir -p "$HOME/.ghcup/bin"
63-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
68+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
6469
chmod a+x "$HOME/.ghcup/bin/ghcup"
6570
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
6671
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
@@ -69,7 +74,7 @@ jobs:
6974
apt-get update
7075
apt-get install -y "$HCNAME"
7176
mkdir -p "$HOME/.ghcup/bin"
72-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
77+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
7378
chmod a+x "$HOME/.ghcup/bin/ghcup"
7479
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
7580
fi

cabal.haskell-ci

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

3+
distribution: focal
4+
35
constraint-set servant-0.17
46
ghc: >= 8.0 && <8.10
57
constraints: servant ==0.17.*

example/example.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ tested-with:
1818
|| ==8.8.4
1919
|| ==8.10.7
2020
|| ==9.0.2
21+
|| ==9.2.2
2122

2223
library
2324
ghc-options: -Wall

servant-openapi3.cabal

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ tested-with:
3333
|| ==8.8.4
3434
|| ==8.10.7
3535
|| ==9.0.2
36+
|| ==9.2.2
3637

3738
extra-source-files:
3839
README.md
@@ -53,8 +54,8 @@ source-repository head
5354

5455
custom-setup
5556
setup-depends:
56-
base >=4.9 && <4.16,
57-
Cabal >= 1.24 && <3.5,
57+
base >=4.9 && <4.17,
58+
Cabal >= 1.24 && <3.7,
5859
cabal-doctest >=1.0.6 && <1.1
5960

6061
library
@@ -75,9 +76,9 @@ library
7576
hs-source-dirs: src
7677
build-depends: aeson >=1.4.2.0 && <1.6 || >=2.0.1.0 && <2.1
7778
, aeson-pretty >=0.8.7 && <0.9
78-
, base >=4.9.1.0 && <4.16
79-
, base-compat >=0.10.5 && <0.12
80-
, bytestring >=0.10.8.1 && <0.11
79+
, base >=4.9.1.0 && <4.17
80+
, base-compat >=0.10.5 && <0.13
81+
, bytestring >=0.10.8.1 && <0.12
8182
, http-media >=0.7.1.3 && <0.9
8283
, insert-ordered-containers >=0.2.1.0 && <0.3
8384
, lens >=4.17 && <5.2
@@ -96,7 +97,7 @@ test-suite doctests
9697
build-depends:
9798
base,
9899
directory >= 1.0,
99-
doctest >= 0.11.1 && <0.20,
100+
doctest >= 0.11.1 && <0.21,
100101
servant,
101102
QuickCheck,
102103
filepath

0 commit comments

Comments
 (0)