Merge pull request #30 from phadej/ghc-8.2

Support GHC-8.2
2024-09-17 09:27:15 +03:00 · 2017-07-15 11:52:57 +03:00 · 2017-07-15 11:52:57 +03:00 · ea96737625
commit ea96737625
parent dd47c3fcaf e65f3eb5f7
3 changed files with 39 additions and 47 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,8 @@
 dist/
+dist-newstyle/
+.ghc.environment.*
 .stack-work/
 .cabal-sandbox
 cabal.sandbox.config
 src/highlight.js
-src/style.css
+src/style.css
--- a/.travis.yml
+++ b/.travis.yml
@ -1,6 +1,6 @@
 # This Travis job script has been generated by a script via
 #
-#   make_travis_yml_2.hs 'servant-swagger-ui.cabal'
+#   make_travis_yml_2.hs '--branch' 'master' 'servant-swagger-ui.cabal'
 #
 # For more information, see https://github.com/hvr/multi-ghc-travis
 #
@ -10,6 +10,10 @@ sudo: false
 git:
  submodules: false  # whether to recursively clone submodules

+branches:
+  only:
+    - master
+
 cache:
  directories:
    - $HOME/.cabal/packages
@ -35,6 +39,9 @@ matrix:
    - compiler: "ghc-8.0.2"
    # env: TEST=--disable-tests BENCH=--disable-benchmarks
      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
+    - compiler: "ghc-8.2.1"
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}

 before_install:
 - HC=${CC}
@ -52,14 +59,14 @@ install:
 - rm -fv cabal.project.local
 - "echo 'packages: .' > cabal.project"
 - rm -f cabal.project.freeze
- - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2
- - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2
+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all
+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all

 # Here starts the actual work to be performed for the package under test;
 # any command which exits with a non-zero exit code causes the build to fail.
 script:
 - if [ -f configure.ac ]; then autoreconf -i; fi
- - rm -rf dist/
+ - rm -rf .ghc.environment.* dist/
 - cabal sdist # test that a source-distribution can be generated
 - cd dist/
 - SRCTAR=(${PKGNAME}-*.tar.gz)
@ -71,46 +78,28 @@ script:
 - "echo 'packages: .' > cabal.project"
 # this builds all libraries and executables (without tests/benchmarks)
 - rm -f cabal.project.freeze
- - cabal new-build -w ${HC} --disable-tests --disable-benchmarks
-
- - if [ ! $HC = "ghc-8.0.1" ]; then UNLESSGHC802=true; fi
- - if [ ! $HC = "ghc-7.8.4" ]; then UNLESSGHC708=true; fi
-
- - $UNLESSGHC802 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.4.*'
- - $UNLESSGHC802 cabal new-build -w ${HC} --enable-tests  --disable-benchmarks '--constraint=servant==0.4.*'
-
- - $UNLESSGHC802 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.5.*'
- - $UNLESSGHC802 cabal new-build -w ${HC} --enable-tests  --disable-benchmarks '--constraint=servant==0.5.*'
-
- - $UNLESSGHC802 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.6.*'
- - $UNLESSGHC802 cabal new-build -w ${HC} --enable-tests  --disable-benchmarks '--constraint=servant==0.6.*'
-
- -               cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.7.*'
- -               cabal new-build -w ${HC} --enable-tests  --disable-benchmarks '--constraint=servant==0.7.*'
-
- -               cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.8.*'
- -               cabal new-build -w ${HC} --enable-tests  --disable-benchmarks '--constraint=servant==0.8.*'
-
- -               cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.9.*'
- -               cabal new-build -w ${HC} --enable-tests  --disable-benchmarks '--constraint=servant==0.9.*'
-
- -               cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.10.*'
- -               cabal new-build -w ${HC} --enable-tests  --disable-benchmarks '--constraint=servant==0.10.*'
-
+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
 # this builds all libraries and executables (including tests/benchmarks)
 # - rm -rf ./dist-newstyle
- - cabal new-build -w ${HC} ${TEST} ${BENCH}

- # there's no 'cabal new-test' yet, so let's emulate for now
- - TESTS=( $(awk 'tolower($0) ~ /^test-suite / { print $2 }' *.cabal) )
- - if [ "$TEST" != "--enable-tests" ]; then TESTS=(); fi
- - shopt -s globstar;
-   RC=true; for T in ${TESTS[@]}; do echo "== $T ==";
-   if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";
-   else echo "= $T FAILED ="; RC=false; fi; done; $RC
+ - if [ $HC = "ghc-8.0.2" -o $HC = "ghc-8.2.1" ]; then UNLESSGHC80=true; fi
+ - if [ $HC = "ghc-8.2.1" ];                      then UNLESSGHC82=true; fi
+
+ #- $UNLESSGHC80 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.4.*'
+ #- $UNLESSGHC80 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.5.*'
+ #- $UNLESSGHC80 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.6.*'
+ #- $UNLESSGHC82 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.7.*'
+ #- $UNLESSGHC82 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.8.*'
+ - $UNLESSGHC82 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.9.*'
+ - $UNLESSGHC82 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.10.*'
+ -              cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.11.*'
+
+
+ # build & run tests, build benchmarks
+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all
+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi
+
+ # haddock
+ - cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all

 # EOF
-
-branches:
-  only:
-    - master
--- a/servant-swagger-ui.cabal
+++ b/servant-swagger-ui.cabal
@ -1,15 +1,16 @@
 name:           servant-swagger-ui
 version:        0.2.3.2.2.8
+x-revision:     1
 synopsis:       Servant swagger ui
 description:    Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)
-category:       Web
+category:       Web, Servant, Swagger
 homepage:       https://github.com/phadej/servant-swagger-ui#readme
 bug-reports:    https://github.com/phadej/servant-swagger-ui/issues
 author:         Oleg Grenrus <oleg.grenrus@iki.fi>
 maintainer:     Oleg Grenrus <oleg.grenrus@iki.fi>
 license:        BSD3
 license-file:   LICENSE
-tested-with:    GHC==7.8.4, GHC==7.10.3, GHC==8.0.2
+tested-with:    GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
 build-type:     Simple
 cabal-version:  >= 1.10

@ -133,7 +134,7 @@ library
      src
  ghc-options: -Wall
  build-depends:
-      base              >=4.7      && <4.10
+      base              >=4.7      && <4.11
    , blaze-markup      >=0.7.0.2  && <0.9
    , bytestring        >=0.10.4.0 && <0.11
    , directory         >=1.2.1.0  && <1.4
@ -145,7 +146,7 @@ library
    , servant-server    >=0.4.4.5  && <0.12
    , servant-swagger   >=1.0.3    && <1.2
    , swagger2          >=2.0.1    && <2.2
-    , template-haskell  >=2.9      && <2.12
+    , template-haskell  >=2.9      && <2.13
    , text              >=1.2.0.6  && <1.3
    , wai-app-static    >=3.0.1.1  && <3.2
  if flag(servant-0-5)