diff --git a/.travis.yml b/.travis.yml index b69fdbd..bf0d487 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ # This Travis job script has been generated by a script via # -# runghc make_travis_yml_2.hs '--branch' 'master' '--output' '.travis.yml' '--config' 'cabal.project' +# haskell-ci '--output' '.travis.yml' '--config=cabal.haskell-ci' 'cabal.project' # # For more information, see https://github.com/haskell-CI/haskell-ci # language: c -sudo: false +dist: xenial git: submodules: false # whether to recursively clone submodules @@ -20,83 +20,78 @@ cache: - $HOME/.cabal/store before_cache: - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log + - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log # remove files that are regenerated by 'cabal update' - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.* - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar - - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx + - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.* + - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json + - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache + - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar + - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx - - rm -rfv $HOME/.cabal/packages/head.hackage + - rm -rfv $CABALHOME/packages/head.hackage matrix: include: - - compiler: "ghc-8.6.1" - # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}} + - compiler: "ghc-8.6.3" + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}} - compiler: "ghc-8.4.4" - # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}} - compiler: "ghc-8.2.2" - # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}} - compiler: "ghc-8.0.2" - # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}} - compiler: "ghc-7.10.3" - # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}} - compiler: "ghc-7.8.4" - # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}} before_install: - - HC=${CC} + - HC=/opt/ghc/bin/${CC} + - HCVER=$(echo "$TRAVIS_COMPILER" | sed 's/ghc-//') + - echo $HCVER - HCPKG=${HC/ghc/ghc-pkg} - unset CC + - CABAL=/opt/ghc/bin/cabal + - CABALHOME=$HOME/.cabal + - export PATH="$CABALHOME/bin:$PATH" - ROOTDIR=$(pwd) - - mkdir -p $HOME/.local/bin - - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH" - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) - echo $HCNUMVER install: - - cabal --version + - ${CABAL} --version - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - - BENCH=${BENCH---enable-benchmarks} - - TEST=${TEST---enable-tests} - - HADDOCK=${HADDOCK-true} - - UNCONSTRAINED=${UNCONSTRAINED-true} - - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false} + - TEST=--enable-tests + - BENCH=--enable-benchmarks - GHCHEAD=${GHCHEAD-false} - - travis_retry cabal update -v - - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config" + - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CABALHOME=$APPDATA/cabal; else export CABALHOME=$HOME/.cabal; fi + - travis_retry ${CABAL} update -v + - sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config - rm -fv cabal.project cabal.project.local - - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$' - - "printf 'packages: \"servant-swagger-ui\" \"servant-swagger-ui-core\" \"servant-swagger-ui-example\" \"servant-swagger-ui-jensoleg\" \"servant-swagger-ui-redoc\"\\n' > cabal.project" + - grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$' + - rm -f cabal.project + - touch cabal.project + - "printf 'packages: \"servant-swagger-ui\"\\n' >> cabal.project" + - "printf 'packages: \"servant-swagger-ui-core\"\\n' >> cabal.project" + - "printf 'packages: \"servant-swagger-ui-example\"\\n' >> cabal.project" + - "printf 'packages: \"servant-swagger-ui-jensoleg\"\\n' >> cabal.project" + - "printf 'packages: \"servant-swagger-ui-redoc\"\\n' >> cabal.project" + - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - touch cabal.project.local - - "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" + - "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" - cat cabal.project || true - cat cabal.project.local || true - - if [ -f "servant-swagger-ui/configure.ac" ]; then - (cd "servant-swagger-ui" && autoreconf -i); - fi - - if [ -f "servant-swagger-ui-core/configure.ac" ]; then - (cd "servant-swagger-ui-core" && autoreconf -i); - fi - - if [ -f "servant-swagger-ui-example/configure.ac" ]; then - (cd "servant-swagger-ui-example" && autoreconf -i); - fi - - if [ -f "servant-swagger-ui-jensoleg/configure.ac" ]; then - (cd "servant-swagger-ui-jensoleg" && autoreconf -i); - fi - - if [ -f "servant-swagger-ui-redoc/configure.ac" ]; then - (cd "servant-swagger-ui-redoc" && autoreconf -i); - fi + - if [ -f "servant-swagger-ui/configure.ac" ]; then (cd "servant-swagger-ui" && autoreconf -i); fi + - if [ -f "servant-swagger-ui-core/configure.ac" ]; then (cd "servant-swagger-ui-core" && autoreconf -i); fi + - if [ -f "servant-swagger-ui-example/configure.ac" ]; then (cd "servant-swagger-ui-example" && autoreconf -i); fi + - if [ -f "servant-swagger-ui-jensoleg/configure.ac" ]; then (cd "servant-swagger-ui-jensoleg" && autoreconf -i); fi + - if [ -f "servant-swagger-ui-redoc/configure.ac" ]; then (cd "servant-swagger-ui-redoc" && autoreconf -i); fi - rm -f cabal.project.freeze - - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all - - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all + - ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry + - "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" + - rm "cabal.project.freeze" + - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all + - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all - 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 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) @@ -104,43 +99,53 @@ install: # any command which exits with a non-zero exit code causes the build to fail. script: # test that source-distributions can be generated - - cabal new-sdist all + - ${CABAL} new-sdist all - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - - "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" + - rm -f cabal.project + - touch cabal.project + - "printf 'packages: \"servant-swagger-ui-*/*.cabal\"\\n' >> cabal.project" + - "printf 'packages: \"servant-swagger-ui-core-*/*.cabal\"\\n' >> cabal.project" + - "printf 'packages: \"servant-swagger-ui-example-*/*.cabal\"\\n' >> cabal.project" + - "printf 'packages: \"servant-swagger-ui-jensoleg-*/*.cabal\"\\n' >> cabal.project" + - "printf 'packages: \"servant-swagger-ui-redoc-*/*.cabal\"\\n' >> cabal.project" + - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - touch cabal.project.local - - "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" + - "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" - cat cabal.project || true - cat cabal.project.local || true # this builds all libraries and executables (without tests/benchmarks) - - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all + - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all # build & run tests, build benchmarks - - cabal new-build -w ${HC} ${TEST} ${BENCH} all + - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all # cabal check - - (cd servant-swagger-ui-* && cabal check) - - (cd servant-swagger-ui-core-* && cabal check) - - (cd servant-swagger-ui-example-* && cabal check) - - (cd servant-swagger-ui-jensoleg-* && cabal check) - - (cd servant-swagger-ui-redoc-* && cabal check) + - (cd servant-swagger-ui-* && ${CABAL} check) + - (cd servant-swagger-ui-core-* && ${CABAL} check) + - (cd servant-swagger-ui-example-* && ${CABAL} check) + - (cd servant-swagger-ui-jensoleg-* && ${CABAL} check) + - (cd servant-swagger-ui-redoc-* && ${CABAL} check) # haddock - - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi + - ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all # Build without installed constraints for packages in global-db - - 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 + - rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all; # Constraint sets - rm -rf cabal.project.local # Constraint set servant-0.14 - - 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 + - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.14.*' all # Constraint set servant-0.15 - - 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 + - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all ; fi + + # Constraint set servant-0.16 + - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi -# REGENDATA ["--branch","master","--output",".travis.yml","--config","cabal.project"] +# REGENDATA ["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"] # EOF diff --git a/cabal.make-travis-yml b/cabal.haskell-ci similarity index 62% rename from cabal.make-travis-yml rename to cabal.haskell-ci index e203e8a..021e8d0 100644 --- a/cabal.make-travis-yml +++ b/cabal.haskell-ci @@ -1,3 +1,5 @@ +branches: master + constraint-set servant-0.14 ghc: >= 7.8 && <8.8 constraints: servant ==0.14.* @@ -5,3 +7,7 @@ constraint-set servant-0.14 constraint-set servant-0.15 ghc: >= 8.0 && <8.8 constraints: servant ==0.15.* + +constraint-set servant-0.16 + ghc: >= 8.0 && <8.8 + constraints: servant ==0.16.* diff --git a/servant-swagger-ui-core/servant-swagger-ui-core.cabal b/servant-swagger-ui-core/servant-swagger-ui-core.cabal index 312e3b0..b45dd4f 100644 --- a/servant-swagger-ui-core/servant-swagger-ui-core.cabal +++ b/servant-swagger-ui-core/servant-swagger-ui-core.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: servant-swagger-ui-core version: 0.3.2 -x-revision: 2 +x-revision: 3 synopsis: Servant swagger ui core components category: Web, Servant, Swagger @@ -18,7 +18,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com license: BSD3 license-file: LICENSE build-type: Simple -tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1 +tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3 extra-source-files: Changelog.md @@ -36,9 +36,9 @@ library , blaze-markup >=0.7.0.2 && <0.9 , bytestring >=0.10.4.0 && <0.11 , http-media >=0.7.1.3 && <0.8 - , servant >=0.14 && <0.16 + , servant >=0.14 && <0.17 , servant-blaze >=0.8 && <0.10 - , servant-server >=0.14 && <0.16 + , servant-server >=0.14 && <0.17 , swagger2 >=2.3.0.1 && <2.4 , text >=1.2.3.0 && <1.3 , transformers >=0.3 && <0.6 diff --git a/servant-swagger-ui-example/servant-swagger-ui-example.cabal b/servant-swagger-ui-example/servant-swagger-ui-example.cabal index 4a196ed..2165b82 100644 --- a/servant-swagger-ui-example/servant-swagger-ui-example.cabal +++ b/servant-swagger-ui-example/servant-swagger-ui-example.cabal @@ -14,7 +14,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com license: BSD3 license-file: LICENSE build-type: Simple -tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1 +tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3 source-repository head type: git diff --git a/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal b/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal index c12d66c..ea4e84e 100644 --- a/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal +++ b/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: servant-swagger-ui-jensoleg version: 0.3.2 -x-revision: 1 +x-revision: 2 synopsis: Servant swagger ui: Jens-Ole Graulund theme category: Web, Servant, Swagger @@ -17,7 +17,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com license: BSD3 license-file: LICENSE build-type: Simple -tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1 +tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3 extra-source-files: jensoleg.index.html.tmpl @@ -86,8 +86,8 @@ library base >=4.7 && <4.13 , bytestring >=0.10.4.0 && <0.11 , file-embed-lzma >=0 && <0.1 - , servant >=0.14 && <0.16 - , servant-server >=0.14 && <0.16 + , servant >=0.14 && <0.17 + , servant-server >=0.14 && <0.17 , swagger2 >=2.3.0.1 && <2.4 , text >=1.2.3.0 && <1.3 exposed-modules: diff --git a/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal b/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal index 88d6898..e83bc10 100644 --- a/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal +++ b/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: servant-swagger-ui-redoc version: 0.3.2.1.22.2 -x-revision: 1 +x-revision: 2 synopsis: Servant swagger ui: ReDoc theme category: Web, Servant, Swagger @@ -17,7 +17,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com license: BSD3 license-file: LICENSE build-type: Simple -tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1 +tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3 extra-source-files: redoc-dist-1.22.2/redoc.min.js @@ -40,8 +40,8 @@ library base >=4.7 && <4.13 , bytestring >=0.10.4.0 && <0.11 , file-embed-lzma >=0 && <0.1 - , servant >=0.14 && <0.16 - , servant-server >=0.14 && <0.16 + , servant >=0.14 && <0.17 + , servant-server >=0.14 && <0.17 , swagger2 >=2.3.0.1 && <2.4 , text >=1.2.3.0 && <1.3 exposed-modules: diff --git a/servant-swagger-ui/servant-swagger-ui.cabal b/servant-swagger-ui/servant-swagger-ui.cabal index b8ec88c..0a61edf 100644 --- a/servant-swagger-ui/servant-swagger-ui.cabal +++ b/servant-swagger-ui/servant-swagger-ui.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: servant-swagger-ui version: 0.3.2.3.19.3 -x-revision: 1 +x-revision: 2 synopsis: Servant swagger ui category: Web, Servant, Swagger @@ -17,7 +17,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com license: BSD3 license-file: LICENSE build-type: Simple -tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.1 +tested-with: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3 extra-source-files: CHANGELOG.md @@ -46,8 +46,8 @@ library base >=4.7 && <4.13 , bytestring >=0.10.4.0 && <0.11 , file-embed-lzma >=0 && <0.1 - , servant >=0.14 && <0.16 - , servant-server >=0.14 && <0.16 + , servant >=0.14 && <0.17 + , servant-server >=0.14 && <0.17 , swagger2 >=2.3.0.1 && <2.4 , text >=1.2.3.0 && <1.3 exposed-modules: