diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 5ce9fb3..d1cdccd 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -32,6 +32,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.12.2 + compilerKind: ghc + compilerVersion: 9.12.2 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.10.1 compilerKind: ghc compilerVersion: 9.10.1 @@ -81,12 +86,12 @@ jobs: - name: Install GHCup run: | mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.50.0/x86_64-linux-ghcup-0.1.50.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 399c16b..e1a1b7d 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -17,5 +17,5 @@ constraint-set servant-0.19 constraints: servant ==0.19.* constraint-set servant-0.20 - ghc: >= 8.10 && <9.12 + ghc: >= 8.10 && <9.14 constraints: servant ==0.20.* diff --git a/servant-swagger-ui-core/servant-swagger-ui-core.cabal b/servant-swagger-ui-core/servant-swagger-ui-core.cabal index f8e56a5..e4972cb 100644 --- a/servant-swagger-ui-core/servant-swagger-ui-core.cabal +++ b/servant-swagger-ui-core/servant-swagger-ui-core.cabal @@ -27,6 +27,7 @@ tested-with: || ==9.6.7 || ==9.8.4 || ==9.10.1 + || ==9.12.2 extra-source-files: Changelog.md @@ -38,7 +39,7 @@ library hs-source-dirs: src ghc-options: -Wall build-depends: - base >=4.7 && <4.21 + base >=4.7 && <4.22 , 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 a4d87e5..526b56e 100644 --- a/servant-swagger-ui-example/servant-swagger-ui-example.cabal +++ b/servant-swagger-ui-example/servant-swagger-ui-example.cabal @@ -22,6 +22,7 @@ tested-with: || ==9.6.7 || ==9.8.4 || ==9.10.1 + || ==9.12.2 source-repository head type: git @@ -32,7 +33,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.7 && <4.22 , 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 e95f119..0e7423d 100644 --- a/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal +++ b/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal @@ -26,6 +26,7 @@ tested-with: || ==9.6.7 || ==9.8.4 || ==9.10.1 + || ==9.12.2 extra-source-files: jensoleg.index.html.tmpl @@ -87,7 +88,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.7 && <4.22 , aeson >=0.8.0.2 && <2.3 , bytestring >=0.10.4.0 && <0.13 , file-embed-lzma >=0 && <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 e6ceb7c..5c5c08d 100644 --- a/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal +++ b/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal @@ -26,6 +26,7 @@ tested-with: || ==9.6.7 || ==9.8.4 || ==9.10.1 + || ==9.12.2 extra-source-files: redoc-dist-1.22.3/redoc.min.js @@ -41,7 +42,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.7 && <4.22 , aeson >=0.8.0.2 && <2.3 , bytestring >=0.10.4.0 && <0.13 , file-embed-lzma >=0 && <0.2 diff --git a/servant-swagger-ui/servant-swagger-ui.cabal b/servant-swagger-ui/servant-swagger-ui.cabal index a5927b8..758bfb1 100644 --- a/servant-swagger-ui/servant-swagger-ui.cabal +++ b/servant-swagger-ui/servant-swagger-ui.cabal @@ -26,6 +26,7 @@ tested-with: || ==9.6.7 || ==9.8.4 || ==9.10.1 + || ==9.12.2 extra-source-files: CHANGELOG.md @@ -57,7 +58,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.7 && <4.22 , aeson >=0.8.0.2 && <2.3 , bytestring >=0.10.4.0 && <0.13 , file-embed-lzma >=0 && <0.2