Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion cabal.haskell-ci
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
3 changes: 2 additions & 1 deletion servant-swagger-ui-core/servant-swagger-ui-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ tested-with:
|| ==9.6.7
|| ==9.8.4
|| ==9.10.1
|| ==9.12.2

extra-source-files: Changelog.md

Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion servant-swagger-ui-example/servant-swagger-ui-example.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ tested-with:
|| ==9.6.7
|| ==9.8.4
|| ==9.10.1
|| ==9.12.2

source-repository head
type: git
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion servant-swagger-ui/servant-swagger-ui.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ tested-with:
|| ==9.6.7
|| ==9.8.4
|| ==9.10.1
|| ==9.12.2

extra-source-files:
CHANGELOG.md
Expand Down Expand Up @@ -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
Expand Down