Skip to content

Commit 757729a

Browse files
authored
Merge pull request #46 from biocad/maksbotan/aeson-2.2
Allow aeson-2.2
2 parents 9eab895 + 4eb0360 commit 757729a

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 16 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.16.3
11+
# version: 0.16.6
1212
#
13-
# REGENDATA ("0.16.3",["github","cabal.project","--config","cabal.haskell-ci"])
13+
# REGENDATA ("0.16.6",["github","cabal.project","--config","cabal.haskell-ci"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -42,9 +42,9 @@ jobs:
4242
compilerVersion: 9.4.5
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.2.7
45+
- compiler: ghc-9.2.8
4646
compilerKind: ghc
47-
compilerVersion: 9.2.7
47+
compilerVersion: 9.2.8
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.0.2
@@ -247,26 +247,38 @@ jobs:
247247
rm -f cabal.project.local
248248
- name: constraint set servant-0.20
249249
run: |
250+
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run ; fi
251+
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
250252
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all ; fi
251253
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all ; fi
252254
- name: constraint set servant-0.19
253255
run: |
256+
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all --dry-run ; fi
257+
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90600)) -ne 0 ] ; then cabal-plan topo | sort ; fi
254258
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all ; fi
255259
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all ; fi
256260
- name: constraint set servant-0.18.2
257261
run: |
262+
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.2' all --dry-run ; fi
263+
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
258264
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.2' --dependencies-only -j2 all ; fi
259265
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.2' all ; fi
260266
- name: constraint set servant-0.18.1
261267
run: |
268+
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.1' all --dry-run ; fi
269+
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
262270
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.1' --dependencies-only -j2 all ; fi
263271
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.1' all ; fi
264272
- name: constraint set servant-0.18
265273
run: |
274+
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18' all --dry-run ; fi
275+
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
266276
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18' --dependencies-only -j2 all ; fi
267277
if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18' all ; fi
268278
- name: constraint set servant-0.17
269279
run: |
280+
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all --dry-run ; fi
281+
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
270282
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi
271283
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
272284
- name: save cache

example/example.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tested-with:
1818
|| ==8.8.4
1919
|| ==8.10.7
2020
|| ==9.0.2
21-
|| ==9.2.7
21+
|| ==9.2.8
2222
|| ==9.4.5
2323
|| ==9.6.2
2424

servant-openapi3.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tested-with:
3333
|| ==8.8.4
3434
|| ==8.10.7
3535
|| ==9.0.2
36-
|| ==9.2.7
36+
|| ==9.2.8
3737
|| ==9.4.5
3838
|| ==9.6.2
3939

@@ -76,7 +76,7 @@ library
7676
Servant.OpenApi.Internal.TypeLevel.Every
7777
Servant.OpenApi.Internal.TypeLevel.TMap
7878
hs-source-dirs: src
79-
build-depends: aeson >=1.4.2.0 && <1.6 || >=2.0.1.0 && <2.2
79+
build-depends: aeson >=1.4.2.0 && <1.6 || >=2.0.1.0 && <2.3
8080
, aeson-pretty >=0.8.7 && <0.9
8181
, base >=4.9.1.0 && <4.19
8282
, base-compat >=0.10.5 && <0.14

0 commit comments

Comments
 (0)