diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 9dcf223..b287541 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -47,9 +47,9 @@ jobs: compilerVersion: 9.4.5 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.7 + - compiler: ghc-9.2.8 compilerKind: ghc - compilerVersion: 9.2.7 + compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 @@ -57,16 +57,6 @@ jobs: compilerVersion: 9.0.2 setup-method: ghcup allow-failure: false - - compiler: ghc-8.10.7 - compilerKind: ghc - compilerVersion: 8.10.7 - setup-method: ghcup - allow-failure: false - - compiler: ghc-8.8.4 - compilerKind: ghc - compilerVersion: 8.8.4 - setup-method: ghcup - allow-failure: false fail-fast: false steps: - name: apt @@ -251,34 +241,16 @@ jobs: rm -f cabal.project.local - name: constraint set servant-0.20 run: | - if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run ; fi - if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi - if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all ; fi - if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all ; fi + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run + cabal-plan topo | sort + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all - name: constraint set servant-0.19 run: | if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all --dry-run ; fi if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cabal-plan topo | sort ; fi if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all ; fi if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all ; fi - - name: constraint set servant-0.18 - run: | - if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all --dry-run ; fi - if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cabal-plan topo | sort ; fi - if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi - if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi - - name: constraint set servant-0.17 - run: | - if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all --dry-run ; fi - if [ $((HCNUMVER < 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi - if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi - if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi - - name: constraint set servant-0.16 - run: | - if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all --dry-run ; fi - if [ $((HCNUMVER < 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi - if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' --dependencies-only -j2 all ; fi - if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi - name: save cache uses: actions/cache/save@v4 if: always() diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 714ca83..b67b41b 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,17 +1,5 @@ branches: master -constraint-set servant-0.16 - ghc: >= 8.0 && <8.10 - constraints: servant ==0.16.* - -constraint-set servant-0.17 - ghc: >= 8.0 && <8.10 - constraints: servant ==0.17.* - -constraint-set servant-0.18 - ghc: >= 8.6 && <9.0 - constraints: servant ==0.18.* - constraint-set servant-0.19 ghc: >= 8.6 && <9.6 constraints: servant ==0.19.* diff --git a/servant-swagger-ui-core/servant-swagger-ui-core.cabal b/servant-swagger-ui-core/servant-swagger-ui-core.cabal index befdeae..524e11d 100644 --- a/servant-swagger-ui-core/servant-swagger-ui-core.cabal +++ b/servant-swagger-ui-core/servant-swagger-ui-core.cabal @@ -19,10 +19,8 @@ license: BSD3 license-file: LICENSE build-type: Simple tested-with: - GHC ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.7 + GHC ==9.0.2 + || ==9.2.8 || ==9.4.5 || ==9.6.6 || ==9.8.2 @@ -37,7 +35,7 @@ library hs-source-dirs: src ghc-options: -Wall build-depends: - base >=4.7 && <4.21 + base >=4.15.1.0 && <4.21 , aeson >=0.8.0.2 && <2.3 , blaze-markup >=0.7.0.2 && <0.9 , bytestring >=0.10.4.0 && <0.13 diff --git a/servant-swagger-ui-example/servant-swagger-ui-example.cabal b/servant-swagger-ui-example/servant-swagger-ui-example.cabal index 875434f..0fb47a9 100644 --- a/servant-swagger-ui-example/servant-swagger-ui-example.cabal +++ b/servant-swagger-ui-example/servant-swagger-ui-example.cabal @@ -14,10 +14,8 @@ license: BSD3 license-file: LICENSE build-type: Simple tested-with: - GHC ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.7 + GHC ==9.0.2 + || ==9.2.8 || ==9.4.5 || ==9.6.6 || ==9.8.2 @@ -31,7 +29,7 @@ executable servant-swagger-ui-example ghc-options: -threaded build-depends: aeson >=0.8.0.2 && <2.3 - , base >=4.7 && <4.21 + , base >=4.15.1.0 && <4.21 , base-compat >=0.9.3 && <0.15 , lens >=4.7.0.1 && <5.4 , servant diff --git a/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal b/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal index e2baa13..db436c7 100644 --- a/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal +++ b/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal @@ -18,10 +18,8 @@ license: BSD3 license-file: LICENSE build-type: Simple tested-with: - GHC ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.7 + GHC ==9.0.2 + || ==9.2.8 || ==9.4.5 || ==9.6.6 || ==9.8.2 @@ -86,7 +84,7 @@ library ghc-options: -Wall build-depends: servant-swagger-ui-core >=0.3.5 && <0.4 build-depends: - base >=4.7 && <4.21 + base >=4.15.1.0 && <4.21 , aeson >=0.8.0.2 && <2.3 , bytestring >=0.10.4.0 && <0.13 , file-embed-lzma >=0.1 && <0.2 diff --git a/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal b/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal index 4a323a8..84d9fc4 100644 --- a/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal +++ b/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal @@ -18,10 +18,8 @@ license: BSD3 license-file: LICENSE build-type: Simple tested-with: - GHC ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.7 + GHC ==9.0.2 + || ==9.2.8 || ==9.4.5 || ==9.6.6 || ==9.8.2 @@ -40,7 +38,7 @@ library ghc-options: -Wall build-depends: servant-swagger-ui-core >=0.3.5 && <0.4 build-depends: - base >=4.7 && <4.21 + base >=4.15.1.0 && <4.21 , aeson >=0.8.0.2 && <2.3 , bytestring >=0.10.4.0 && <0.13 , file-embed-lzma >=0.1 && <0.2 diff --git a/servant-swagger-ui/servant-swagger-ui.cabal b/servant-swagger-ui/servant-swagger-ui.cabal index 8feed3c..efc9241 100644 --- a/servant-swagger-ui/servant-swagger-ui.cabal +++ b/servant-swagger-ui/servant-swagger-ui.cabal @@ -18,10 +18,8 @@ license: BSD3 license-file: LICENSE build-type: Simple tested-with: - GHC ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.7 + GHC ==9.0.2 + || ==9.2.8 || ==9.4.5 || ==9.6.6 || ==9.8.2 @@ -56,7 +54,7 @@ library ghc-options: -Wall build-depends: servant-swagger-ui-core >=0.3.5 && <0.4 build-depends: - base >=4.7 && <4.21 + base >=4.15.1.0 && <4.21 , aeson >=0.8.0.2 && <2.3 , bytestring >=0.10.4.0 && <0.13 , file-embed-lzma >=0.1 && <0.2