Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require file-embed-lzma>=0.1 #115

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Require file-embed-lzma>=0.1 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a6edb6
Require file-embed-lzma>=0.1
ysangkok Jul 3, 2024
88dcf0a
Drop support for GHC 8 series
ysangkok Jul 3, 2024
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
49 changes: 13 additions & 36 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,31 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.6.2
- compiler: ghc-9.8.2
compilerKind: ghc
compilerVersion: 9.6.2
compilerVersion: 9.8.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.6
compilerKind: ghc
compilerVersion: 9.6.6
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.5
compilerKind: ghc
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
compilerKind: ghc
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
Expand Down Expand Up @@ -246,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()
Expand Down
14 changes: 1 addition & 13 deletions cabal.haskell-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
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.*

constraint-set servant-0.20
ghc: >= 8.10 && <9.8
ghc: >= 8.10 && <9.10
constraints: servant ==0.20.*
11 changes: 5 additions & 6 deletions servant-swagger-ui-core/servant-swagger-ui-core.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ 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.2
|| ==9.6.6
|| ==9.8.2

extra-source-files: Changelog.md

Expand All @@ -36,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
Expand Down
11 changes: 5 additions & 6 deletions servant-swagger-ui-example/servant-swagger-ui-example.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ 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.2
|| ==9.6.6
|| ==9.8.2

source-repository head
type: git
Expand All @@ -30,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
Expand Down
15 changes: 7 additions & 8 deletions servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12
name: servant-swagger-ui-jensoleg
version: 0.3.4
version: 0.3.5
synopsis: Servant swagger ui: Jens-Ole Graulund theme
category: Web, Servant, Swagger
description:
Expand All @@ -18,12 +18,11 @@ 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.2
|| ==9.6.6
|| ==9.8.2

extra-source-files:
jensoleg.index.html.tmpl
Expand Down Expand Up @@ -85,10 +84,10 @@ 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 && <0.1
, file-embed-lzma >=0.1 && <0.2
, servant >=0.14 && <0.21
, servant-server >=0.14 && <0.21
, text >=1.2.3.0 && <2.2
Expand Down
2 changes: 1 addition & 1 deletion servant-swagger-ui-jensoleg/src/Servant/Swagger/UI/JensOleG.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import Servant.Swagger.UI.Core
import Data.Aeson (ToJSON, Value)
import Data.ByteString (ByteString)
import Data.Text (Text)
import FileEmbedLzma
import FileEmbedLzma.Untyped
import Servant

-- | Serve alternative Swagger UI.
Expand Down
15 changes: 7 additions & 8 deletions servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12
name: servant-swagger-ui-redoc
version: 0.3.4.1.22.3
version: 0.3.4.1.22.4
synopsis: Servant swagger ui: ReDoc theme
category: Web, Servant, Swagger
description:
Expand All @@ -18,12 +18,11 @@ 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.2
|| ==9.6.6
|| ==9.8.2

extra-source-files:
redoc-dist-1.22.3/redoc.min.js
Expand All @@ -39,10 +38,10 @@ 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 && <0.1
, file-embed-lzma >=0.1 && <0.2
, servant >=0.14 && <0.21
, servant-server >=0.14 && <0.21
, text >=1.2.3.0 && <2.2
Expand Down
2 changes: 1 addition & 1 deletion servant-swagger-ui-redoc/src/Servant/Swagger/UI/ReDoc.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import Servant.Swagger.UI.Core
import Data.Aeson (ToJSON, Value)
import Data.ByteString (ByteString)
import Data.Text (Text)
import FileEmbedLzma
import FileEmbedLzma.Untyped
import Servant

-- | Serve alternative Swagger UI.
Expand Down
15 changes: 7 additions & 8 deletions servant-swagger-ui/servant-swagger-ui.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12
name: servant-swagger-ui
version: 0.3.5.5.0.0
version: 0.3.5.5.0.1
synopsis: Servant swagger ui
category: Web, Servant, Swagger
description:
Expand All @@ -18,12 +18,11 @@ 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.2
|| ==9.6.6
|| ==9.8.2

extra-source-files:
CHANGELOG.md
Expand Down Expand Up @@ -55,10 +54,10 @@ 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 && <0.1
, file-embed-lzma >=0.1 && <0.2
, servant >=0.14 && <0.21
, servant-server >=0.14 && <0.21
, text >=1.2.3.0 && <2.2
Expand Down
2 changes: 1 addition & 1 deletion servant-swagger-ui/src/Servant/Swagger/UI.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import Servant.Swagger.UI.Core
import Data.Aeson (ToJSON, Value)
import Data.ByteString (ByteString)
import Data.Text (Text)
import FileEmbedLzma
import FileEmbedLzma.Untyped
import Servant

-- | Serve Swagger UI on @/dir@ using @api@ as a Swagger spec source.
Expand Down