Skip to content

Commit ce291ba

Browse files
ysangkokysangkok
authored
Allow newer deps (used in Nightly), add 9.0 CI (haskell-servant#99)
1 parent e8431df commit ce291ba

File tree

7 files changed

+27
-30
lines changed

7 files changed

+27
-30
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.0.2
36+
compilerKind: ghc
37+
compilerVersion: 9.0.2
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-8.10.7
3641
compilerKind: ghc
3742
compilerVersion: 8.10.7
@@ -199,16 +204,6 @@ jobs:
199204
echo " ghc-options: -Werror=missing-methods" >> cabal.project
200205
echo "package servant-swagger-ui-redoc" >> cabal.project
201206
echo " ghc-options: -Werror=missing-methods" >> cabal.project
202-
cat >> cabal.project <<EOF
203-
allow-newer: swagger2:base
204-
allow-newer: swagger2:lens
205-
allow-newer: swagger2:optics-core
206-
allow-newer: swagger2:optics-th
207-
allow-newer: swagger2:template-haskell
208-
allow-newer: servant-swagger:base
209-
allow-newer: servant-swagger:lens
210-
allow-newer: servant-swagger:Cabal
211-
EOF
212207
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(servant-swagger-ui|servant-swagger-ui-core|servant-swagger-ui-example|servant-swagger-ui-jensoleg|servant-swagger-ui-redoc)$/; }' >> cabal.project.local
213208
cat cabal.project
214209
cat cabal.project.local
@@ -260,8 +255,8 @@ jobs:
260255
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all
261256
- name: constraint set servant-0.18
262257
run: |
263-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all
264-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all
258+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
259+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
265260
- name: constraint set servant-0.17
266261
run: |
267262
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi

‎cabal.project

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@ packages:
44
servant-swagger-ui-example/
55
servant-swagger-ui-jensoleg/
66
servant-swagger-ui-redoc/
7-
8-
allow-newer: swagger2:base, swagger2:lens, swagger2:optics-core, swagger2:optics-th, swagger2:template-haskell
9-
allow-newer: servant-swagger:base, servant-swagger:lens, servant-swagger:Cabal

‎servant-swagger-ui-core/servant-swagger-ui-core.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ tested-with:
2222
GHC ==8.6.5
2323
|| ==8.8.4
2424
|| ==8.10.7
25+
|| ==9.0.2
2526

2627
extra-source-files: Changelog.md
2728

@@ -34,14 +35,14 @@ library
3435
ghc-options: -Wall
3536
build-depends:
3637
base >=4.7 && <4.16
37-
, aeson >=0.8.0.2 && <1.6
38+
, aeson >=0.8.0.2 && <2.1.0
3839
, blaze-markup >=0.7.0.2 && <0.9
39-
, bytestring >=0.10.4.0 && <0.11
40+
, bytestring >=0.10.4.0 && <0.12
4041
, http-media >=0.7.1.3 && <0.9
4142
, servant >=0.14 && <0.20
4243
, servant-blaze >=0.8 && <0.10
4344
, servant-server >=0.14 && <0.20
44-
, text >=1.2.3.0 && <1.3
45+
, text >=1.2.3.0 && <2.1
4546
, transformers >=0.3 && <0.6
4647
, transformers-compat >=0.3 && <0.7
4748
, wai-app-static >=3.0.1.1 && <3.2

‎servant-swagger-ui-example/servant-swagger-ui-example.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ tested-with:
1717
GHC ==8.6.5
1818
|| ==8.8.4
1919
|| ==8.10.7
20+
|| ==9.0.2
2021

2122
source-repository head
2223
type: git
@@ -26,9 +27,9 @@ executable servant-swagger-ui-example
2627
main-is: Main.hs
2728
ghc-options: -threaded
2829
build-depends:
29-
aeson >=0.8.0.2 && <1.6
30+
aeson >=0.8.0.2 && <2.1.0
3031
, base >=4.7 && <4.16
31-
, base-compat >=0.9.3 && <0.12
32+
, base-compat >=0.9.3 && <0.13
3233
, lens >=4.7.0.1 && <5.2
3334
, servant
3435
, servant-server

‎servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ category: Web, Servant, Swagger
66
description:
77
Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)
88
.
9-
Jsn-Ole Graulund theme https://github.com/jensoleg/swagger-org
9+
Jens-Ole Graulund theme https://github.com/jensoleg/swagger-org
1010

1111
homepage: https://github.com/haskell-servant/servant-swagger-ui
1212
bug-reports:
@@ -21,6 +21,7 @@ tested-with:
2121
GHC ==8.6.5
2222
|| ==8.8.4
2323
|| ==8.10.7
24+
|| ==9.0.2
2425

2526
extra-source-files:
2627
jensoleg.index.html.tmpl
@@ -83,12 +84,12 @@ library
8384
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
8485
build-depends:
8586
base >=4.7 && <4.16
86-
, aeson >=0.8.0.2 && <1.6
87-
, bytestring >=0.10.4.0 && <0.11
87+
, aeson >=0.8.0.2 && <2.1.0
88+
, bytestring >=0.10.4.0 && <0.12
8889
, file-embed-lzma >=0 && <0.1
8990
, servant >=0.14 && <0.20
9091
, servant-server >=0.14 && <0.20
91-
, text >=1.2.3.0 && <1.3
92+
, text >=1.2.3.0 && <2.1
9293

9394
exposed-modules: Servant.Swagger.UI.JensOleG
9495
default-language: Haskell2010

‎servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ tested-with:
2121
GHC ==8.6.5
2222
|| ==8.8.4
2323
|| ==8.10.7
24+
|| ==9.0.2
2425

2526
extra-source-files:
2627
redoc-dist-1.22.3/redoc.min.js
@@ -37,12 +38,12 @@ library
3738
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
3839
build-depends:
3940
base >=4.7 && <4.16
40-
, aeson >=0.8.0.2 && <1.6
41-
, bytestring >=0.10.4.0 && <0.11
41+
, aeson >=0.8.0.2 && <2.1.0
42+
, bytestring >=0.10.4.0 && <0.12
4243
, file-embed-lzma >=0 && <0.1
4344
, servant >=0.14 && <0.20
4445
, servant-server >=0.14 && <0.20
45-
, text >=1.2.3.0 && <1.3
46+
, text >=1.2.3.0 && <2.1
4647

4748
exposed-modules: Servant.Swagger.UI.ReDoc
4849
default-language: Haskell2010

‎servant-swagger-ui/servant-swagger-ui.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ tested-with:
2121
GHC ==8.6.5
2222
|| ==8.8.4
2323
|| ==8.10.7
24+
|| ==9.0.2
2425

2526
extra-source-files:
2627
CHANGELOG.md
@@ -47,12 +48,12 @@ library
4748
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
4849
build-depends:
4950
base >=4.7 && <4.16
50-
, aeson >=0.8.0.2 && <1.6
51-
, bytestring >=0.10.4.0 && <0.11
51+
, aeson >=0.8.0.2 && <2.1.0
52+
, bytestring >=0.10.4.0 && <0.12
5253
, file-embed-lzma >=0 && <0.1
5354
, servant >=0.14 && <0.20
5455
, servant-server >=0.14 && <0.20
55-
, text >=1.2.3.0 && <1.3
56+
, text >=1.2.3.0 && <2.1
5657

5758
exposed-modules: Servant.Swagger.UI
5859
default-language: Haskell2010

0 commit comments

Comments
 (0)