git.iko.soy/typeable/servant-swagger-ui
on master help sign in
Merge pull request #61 from haskell-servant/servant-0.16

Allow servant-0.16

commit48369855e598ce762d338236e8160b5c55a867e9 authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 27 Feb 2019, 23:50 (8 years ago) parent85fbcbf6bbcf4e
7 files changed+91−80
compare with master
unifiedsplit
.travis.yml+68−63 cabal.make-travis-yml → cabal.haskell-ci+6 servant-swagger-ui-core/servant-swagger-ui-core.cabal+4−4 servant-swagger-ui-example/servant-swagger-ui-example.cabal+1−1 servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal+4−4 servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal+4−4 servant-swagger-ui/servant-swagger-ui.cabal+4−4
.travis.yml+68−63
@@ -1,11 +1,11 @@
11# This Travis job script has been generated by a script via
22#
3−# runghc make_travis_yml_2.hs '--branch' 'master' '--output' '.travis.yml' '--config' 'cabal.project'
3+# haskell-ci '--output' '.travis.yml' '--config=cabal.haskell-ci' 'cabal.project'
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
77language: c
8−sudo: false
8+dist: xenial
99
1010git:
1111 submodules: false # whether to recursively clone submodules
@@ -20,83 +20,78 @@ cache:
2020 - $HOME/.cabal/store
2121
2222before_cache:
23− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
23+ - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2424 # remove files that are regenerated by 'cabal update'
25− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
26− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
27− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
28− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
29− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
25+ - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
26+ - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
27+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
28+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
29+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
3030
31− - rm -rfv $HOME/.cabal/packages/head.hackage
31+ - rm -rfv $CABALHOME/packages/head.hackage
3232
3333matrix:
3434 include:
35− - compiler: "ghc-8.6.1"
36− # env: TEST=--disable-tests BENCH=--disable-benchmarks
37− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
35+ - compiler: "ghc-8.6.3"
36+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
3837 - compiler: "ghc-8.4.4"
39− # env: TEST=--disable-tests BENCH=--disable-benchmarks
4038 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
4139 - compiler: "ghc-8.2.2"
42− # env: TEST=--disable-tests BENCH=--disable-benchmarks
4340 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4441 - compiler: "ghc-8.0.2"
45− # env: TEST=--disable-tests BENCH=--disable-benchmarks
4642 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4743 - compiler: "ghc-7.10.3"
48− # env: TEST=--disable-tests BENCH=--disable-benchmarks
4944 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
5045 - compiler: "ghc-7.8.4"
51− # env: TEST=--disable-tests BENCH=--disable-benchmarks
5246 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
5347
5448before_install:
55− - HC=${CC}
49+ - HC=/opt/ghc/bin/${CC}
50+ - HCVER=$(echo "$TRAVIS_COMPILER" | sed 's/ghc-//')
51+ - echo $HCVER
5652 - HCPKG=${HC/ghc/ghc-pkg}
5753 - unset CC
54+ - CABAL=/opt/ghc/bin/cabal
55+ - CABALHOME=$HOME/.cabal
56+ - export PATH="$CABALHOME/bin:$PATH"
5857 - ROOTDIR=$(pwd)
59− - mkdir -p $HOME/.local/bin
60− - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
6158 - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
6259 - echo $HCNUMVER
6360
6461install:
65− - cabal --version
62+ - ${CABAL} --version
6663 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
67− - BENCH=${BENCH---enable-benchmarks}
68− - TEST=${TEST---enable-tests}
69− - HADDOCK=${HADDOCK-true}
70− - UNCONSTRAINED=${UNCONSTRAINED-true}
71− - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
64+ - TEST=--enable-tests
65+ - BENCH=--enable-benchmarks
7266 - GHCHEAD=${GHCHEAD-false}
73− - travis_retry cabal update -v
74− - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
67+ - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CABALHOME=$APPDATA/cabal; else export CABALHOME=$HOME/.cabal; fi
68+ - travis_retry ${CABAL} update -v
69+ - sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config
7570 - rm -fv cabal.project cabal.project.local
76− - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
77− - "printf 'packages: \"servant-swagger-ui\" \"servant-swagger-ui-core\" \"servant-swagger-ui-example\" \"servant-swagger-ui-jensoleg\" \"servant-swagger-ui-redoc\"\\n' > cabal.project"
71+ - grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
72+ - rm -f cabal.project
73+ - touch cabal.project
74+ - "printf 'packages: \"servant-swagger-ui\"\\n' >> cabal.project"
75+ - "printf 'packages: \"servant-swagger-ui-core\"\\n' >> cabal.project"
76+ - "printf 'packages: \"servant-swagger-ui-example\"\\n' >> cabal.project"
77+ - "printf 'packages: \"servant-swagger-ui-jensoleg\"\\n' >> cabal.project"
78+ - "printf 'packages: \"servant-swagger-ui-redoc\"\\n' >> cabal.project"
79+ - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
7880 - touch cabal.project.local
79− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant-swagger-ui | grep -vw -- servant-swagger-ui-core | grep -vw -- servant-swagger-ui-example | grep -vw -- servant-swagger-ui-jensoleg | grep -vw -- servant-swagger-ui-redoc | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
81+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-swagger-ui|servant-swagger-ui-core|servant-swagger-ui-example|servant-swagger-ui-jensoleg|servant-swagger-ui-redoc)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
8082 - cat cabal.project || true
8183 - cat cabal.project.local || true
82− - if [ -f "servant-swagger-ui/configure.ac" ]; then
83− (cd "servant-swagger-ui" && autoreconf -i);
84− fi
85− - if [ -f "servant-swagger-ui-core/configure.ac" ]; then
86− (cd "servant-swagger-ui-core" && autoreconf -i);
87− fi
88− - if [ -f "servant-swagger-ui-example/configure.ac" ]; then
89− (cd "servant-swagger-ui-example" && autoreconf -i);
90− fi
91− - if [ -f "servant-swagger-ui-jensoleg/configure.ac" ]; then
92− (cd "servant-swagger-ui-jensoleg" && autoreconf -i);
93− fi
94− - if [ -f "servant-swagger-ui-redoc/configure.ac" ]; then
95− (cd "servant-swagger-ui-redoc" && autoreconf -i);
96− fi
84+ - if [ -f "servant-swagger-ui/configure.ac" ]; then (cd "servant-swagger-ui" && autoreconf -i); fi
85+ - if [ -f "servant-swagger-ui-core/configure.ac" ]; then (cd "servant-swagger-ui-core" && autoreconf -i); fi
86+ - if [ -f "servant-swagger-ui-example/configure.ac" ]; then (cd "servant-swagger-ui-example" && autoreconf -i); fi
87+ - if [ -f "servant-swagger-ui-jensoleg/configure.ac" ]; then (cd "servant-swagger-ui-jensoleg" && autoreconf -i); fi
88+ - if [ -f "servant-swagger-ui-redoc/configure.ac" ]; then (cd "servant-swagger-ui-redoc" && autoreconf -i); fi
9789 - rm -f cabal.project.freeze
98− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
99− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
90+ - ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry
91+ - "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
92+ - rm "cabal.project.freeze"
93+ - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
94+ - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
10095 - rm -rf .ghc.environment.* "servant-swagger-ui"/dist "servant-swagger-ui-core"/dist "servant-swagger-ui-example"/dist "servant-swagger-ui-jensoleg"/dist "servant-swagger-ui-redoc"/dist
10196 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
10297
@@ -104,43 +99,53 @@ install:
10499# any command which exits with a non-zero exit code causes the build to fail.
105100script:
106101 # test that source-distributions can be generated
107− - cabal new-sdist all
102+ - ${CABAL} new-sdist all
108103 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
109104 - cd ${DISTDIR} || false
110105 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
111− - "printf 'packages: servant-swagger-ui-*/*.cabal servant-swagger-ui-core-*/*.cabal servant-swagger-ui-example-*/*.cabal servant-swagger-ui-jensoleg-*/*.cabal servant-swagger-ui-redoc-*/*.cabal\\n' > cabal.project"
106+ - rm -f cabal.project
107+ - touch cabal.project
108+ - "printf 'packages: \"servant-swagger-ui-*/*.cabal\"\\n' >> cabal.project"
109+ - "printf 'packages: \"servant-swagger-ui-core-*/*.cabal\"\\n' >> cabal.project"
110+ - "printf 'packages: \"servant-swagger-ui-example-*/*.cabal\"\\n' >> cabal.project"
111+ - "printf 'packages: \"servant-swagger-ui-jensoleg-*/*.cabal\"\\n' >> cabal.project"
112+ - "printf 'packages: \"servant-swagger-ui-redoc-*/*.cabal\"\\n' >> cabal.project"
113+ - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
112114 - touch cabal.project.local
113− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant-swagger-ui | grep -vw -- servant-swagger-ui-core | grep -vw -- servant-swagger-ui-example | grep -vw -- servant-swagger-ui-jensoleg | grep -vw -- servant-swagger-ui-redoc | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
115+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-swagger-ui|servant-swagger-ui-core|servant-swagger-ui-example|servant-swagger-ui-jensoleg|servant-swagger-ui-redoc)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
114116 - cat cabal.project || true
115117 - cat cabal.project.local || true
116118 # this builds all libraries and executables (without tests/benchmarks)
117− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
119+ - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all
118120
119121 # build & run tests, build benchmarks
120− - cabal new-build -w ${HC} ${TEST} ${BENCH} all
122+ - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
121123
122124 # cabal check
123− - (cd servant-swagger-ui-* && cabal check)
124− - (cd servant-swagger-ui-core-* && cabal check)
125− - (cd servant-swagger-ui-example-* && cabal check)
126− - (cd servant-swagger-ui-jensoleg-* && cabal check)
127− - (cd servant-swagger-ui-redoc-* && cabal check)
125+ - (cd servant-swagger-ui-* && ${CABAL} check)
126+ - (cd servant-swagger-ui-core-* && ${CABAL} check)
127+ - (cd servant-swagger-ui-example-* && ${CABAL} check)
128+ - (cd servant-swagger-ui-jensoleg-* && ${CABAL} check)
129+ - (cd servant-swagger-ui-redoc-* && ${CABAL} check)
128130
129131 # haddock
130− - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
132+ - ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all
131133
132134 # Build without installed constraints for packages in global-db
133− - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
135+ - rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all;
134136
135137 # Constraint sets
136138 - rm -rf cabal.project.local
137139
138140 # Constraint set servant-0.14
139− - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80800 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.14.*' all; else echo skipping...; fi
141+ - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.14.*' all
140142
141143 # Constraint set servant-0.15
142− - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all; else echo skipping...; fi
144+ - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all ; fi
143145
146+ # Constraint set servant-0.16
147+ - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
144148
145−# REGENDATA ["--branch","master","--output",".travis.yml","--config","cabal.project"]
149+
150+# REGENDATA ["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"]
146151# EOF
cabal.make-travis-yml → cabal.haskell-cirenamed+6
@@ -1,3 +1,5 @@
1+branches: master
2+
13constraint-set servant-0.14
24 ghc: >= 7.8 && <8.8
35 constraints: servant ==0.14.*
@@ -5,3 +7,7 @@ constraint-set servant-0.14
57constraint-set servant-0.15
68 ghc: >= 8.0 && <8.8
79 constraints: servant ==0.15.*
10+
11+constraint-set servant-0.16
12+ ghc: >= 8.0 && <8.8
13+ constraints: servant ==0.16.*
servant-swagger-ui-core/servant-swagger-ui-core.cabal+4−4
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui-core
33version: 0.3.2
4−x-revision: 2
4+x-revision: 3
55
66synopsis: Servant swagger ui core components
77category: Web, Servant, Swagger
@@ -18,7 +18,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1818license: BSD3
1919license-file: LICENSE
2020build-type: Simple
21−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1
21+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
2222extra-source-files:
2323 Changelog.md
2424
@@ -36,9 +36,9 @@ library
3636 , blaze-markup >=0.7.0.2 && <0.9
3737 , bytestring >=0.10.4.0 && <0.11
3838 , http-media >=0.7.1.3 && <0.8
39− , servant >=0.14 && <0.16
39+ , servant >=0.14 && <0.17
4040 , servant-blaze >=0.8 && <0.10
41− , servant-server >=0.14 && <0.16
41+ , servant-server >=0.14 && <0.17
4242 , swagger2 >=2.3.0.1 && <2.4
4343 , text >=1.2.3.0 && <1.3
4444 , transformers >=0.3 && <0.6
servant-swagger-ui-example/servant-swagger-ui-example.cabal+1−1
@@ -14,7 +14,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1414license: BSD3
1515license-file: LICENSE
1616build-type: Simple
17−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1
17+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
1818
1919source-repository head
2020 type: git
servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal+4−4
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui-jensoleg
33version: 0.3.2
4−x-revision: 1
4+x-revision: 2
55
66synopsis: Servant swagger ui: Jens-Ole Graulund theme
77category: Web, Servant, Swagger
@@ -17,7 +17,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1717license: BSD3
1818license-file: LICENSE
1919build-type: Simple
20−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1
20+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
2121
2222extra-source-files:
2323 jensoleg.index.html.tmpl
@@ -86,8 +86,8 @@ library
8686 base >=4.7 && <4.13
8787 , bytestring >=0.10.4.0 && <0.11
8888 , file-embed-lzma >=0 && <0.1
89− , servant >=0.14 && <0.16
90− , servant-server >=0.14 && <0.16
89+ , servant >=0.14 && <0.17
90+ , servant-server >=0.14 && <0.17
9191 , swagger2 >=2.3.0.1 && <2.4
9292 , text >=1.2.3.0 && <1.3
9393 exposed-modules:
servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal+4−4
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui-redoc
33version: 0.3.2.1.22.2
4−x-revision: 1
4+x-revision: 2
55
66synopsis: Servant swagger ui: ReDoc theme
77category: Web, Servant, Swagger
@@ -17,7 +17,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1717license: BSD3
1818license-file: LICENSE
1919build-type: Simple
20−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1
20+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
2121
2222extra-source-files:
2323 redoc-dist-1.22.2/redoc.min.js
@@ -40,8 +40,8 @@ library
4040 base >=4.7 && <4.13
4141 , bytestring >=0.10.4.0 && <0.11
4242 , file-embed-lzma >=0 && <0.1
43− , servant >=0.14 && <0.16
44− , servant-server >=0.14 && <0.16
43+ , servant >=0.14 && <0.17
44+ , servant-server >=0.14 && <0.17
4545 , swagger2 >=2.3.0.1 && <2.4
4646 , text >=1.2.3.0 && <1.3
4747 exposed-modules:
servant-swagger-ui/servant-swagger-ui.cabal+4−4
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui
33version: 0.3.2.3.19.3
4−x-revision: 1
4+x-revision: 2
55
66synopsis: Servant swagger ui
77category: Web, Servant, Swagger
@@ -17,7 +17,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1717license: BSD3
1818license-file: LICENSE
1919build-type: Simple
20−tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1
20+tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
2121
2222extra-source-files:
2323 CHANGELOG.md
@@ -46,8 +46,8 @@ library
4646 base >=4.7 && <4.13
4747 , bytestring >=0.10.4.0 && <0.11
4848 , file-embed-lzma >=0 && <0.1
49− , servant >=0.14 && <0.16
50− , servant-server >=0.14 && <0.16
49+ , servant >=0.14 && <0.17
50+ , servant-server >=0.14 && <0.17
5151 , swagger2 >=2.3.0.1 && <2.4
5252 , text >=1.2.3.0 && <1.3
5353 exposed-modules: