git.iko.soy/typeable/servant-swagger-ui
on master help sign in
Support GHC-8.2
commite65f3eb5f7178c8b67a909c7ccb767ab44015218 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSat 15 Jul 2017, 01:25 (9 years ago) parentdd47c3f
3 files changed+37−45
.gitignore+3−1 .travis.yml+29−40 servant-swagger-ui.cabal+5−4
.gitignore+3−1
@@ -1,6 +1,8 @@
11dist/
2+dist-newstyle/
3+.ghc.environment.*
24.stack-work/
35.cabal-sandbox
46cabal.sandbox.config
57src/highlight.js
6−src/style.css
8+src/style.css
.travis.yml+29−40
@@ -1,6 +1,6 @@
11# This Travis job script has been generated by a script via
22#
3−# make_travis_yml_2.hs 'servant-swagger-ui.cabal'
3+# make_travis_yml_2.hs '--branch' 'master' 'servant-swagger-ui.cabal'
44#
55# For more information, see https://github.com/hvr/multi-ghc-travis
66#
@@ -10,6 +10,10 @@ sudo: false
1010git:
1111 submodules: false # whether to recursively clone submodules
1212
13+branches:
14+ only:
15+ - master
16+
1317cache:
1418 directories:
1519 - $HOME/.cabal/packages
@@ -35,6 +39,9 @@ matrix:
3539 - compiler: "ghc-8.0.2"
3640 # env: TEST=--disable-tests BENCH=--disable-benchmarks
3741 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
42+ - compiler: "ghc-8.2.1"
43+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
44+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}
3845
3946before_install:
4047 - HC=${CC}
@@ -52,14 +59,14 @@ install:
5259 - rm -fv cabal.project.local
5360 - "echo 'packages: .' > cabal.project"
5461 - rm -f cabal.project.freeze
55− - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2
56− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2
62+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all
63+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all
5764
5865# Here starts the actual work to be performed for the package under test;
5966# any command which exits with a non-zero exit code causes the build to fail.
6067script:
6168 - if [ -f configure.ac ]; then autoreconf -i; fi
62− - rm -rf dist/
69+ - rm -rf .ghc.environment.* dist/
6370 - cabal sdist # test that a source-distribution can be generated
6471 - cd dist/
6572 - SRCTAR=(${PKGNAME}-*.tar.gz)
@@ -71,46 +78,28 @@ script:
7178 - "echo 'packages: .' > cabal.project"
7279 # this builds all libraries and executables (without tests/benchmarks)
7380 - rm -f cabal.project.freeze
74− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks
75−
76− - if [ ! $HC = "ghc-8.0.1" ]; then UNLESSGHC802=true; fi
77− - if [ ! $HC = "ghc-7.8.4" ]; then UNLESSGHC708=true; fi
78−
79− - $UNLESSGHC802 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.4.*'
80− - $UNLESSGHC802 cabal new-build -w ${HC} --enable-tests --disable-benchmarks '--constraint=servant==0.4.*'
81−
82− - $UNLESSGHC802 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.5.*'
83− - $UNLESSGHC802 cabal new-build -w ${HC} --enable-tests --disable-benchmarks '--constraint=servant==0.5.*'
84−
85− - $UNLESSGHC802 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.6.*'
86− - $UNLESSGHC802 cabal new-build -w ${HC} --enable-tests --disable-benchmarks '--constraint=servant==0.6.*'
87−
88− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.7.*'
89− - cabal new-build -w ${HC} --enable-tests --disable-benchmarks '--constraint=servant==0.7.*'
81+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
82+ # this builds all libraries and executables (including tests/benchmarks)
83+ # - rm -rf ./dist-newstyle
9084
91− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.8.*'
92− - cabal new-build -w ${HC} --enable-tests --disable-benchmarks '--constraint=servant==0.8.*'
85+ - if [ $HC = "ghc-8.0.2" -o $HC = "ghc-8.2.1" ]; then UNLESSGHC80=true; fi
86+ - if [ $HC = "ghc-8.2.1" ]; then UNLESSGHC82=true; fi
9387
94− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.9.*'
95− - cabal new-build -w ${HC} --enable-tests --disable-benchmarks '--constraint=servant==0.9.*'
88+ #- $UNLESSGHC80 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.4.*'
89+ #- $UNLESSGHC80 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.5.*'
90+ #- $UNLESSGHC80 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.6.*'
91+ #- $UNLESSGHC82 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.7.*'
92+ #- $UNLESSGHC82 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.8.*'
93+ - $UNLESSGHC82 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.9.*'
94+ - $UNLESSGHC82 cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.10.*'
95+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.11.*'
9696
97− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks '--constraint=servant==0.10.*'
98− - cabal new-build -w ${HC} --enable-tests --disable-benchmarks '--constraint=servant==0.10.*'
9997
100− # this builds all libraries and executables (including tests/benchmarks)
101− # - rm -rf ./dist-newstyle
102− - cabal new-build -w ${HC} ${TEST} ${BENCH}
98+ # build & run tests, build benchmarks
99+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all
100+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi
103101
104− # there's no 'cabal new-test' yet, so let's emulate for now
105− - TESTS=( $(awk 'tolower($0) ~ /^test-suite / { print $2 }' *.cabal) )
106− - if [ "$TEST" != "--enable-tests" ]; then TESTS=(); fi
107− - shopt -s globstar;
108− RC=true; for T in ${TESTS[@]}; do echo "== $T ==";
109− if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";
110− else echo "= $T FAILED ="; RC=false; fi; done; $RC
102+ # haddock
103+ - cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all
111104
112105# EOF
113−
114−branches:
115− only:
116− - master
servant-swagger-ui.cabal+5−4
@@ -1,15 +1,16 @@
11name: servant-swagger-ui
22version: 0.2.3.2.2.8
3+x-revision: 1
34synopsis: Servant swagger ui
45description: Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)
5−category: Web
6+category: Web, Servant, Swagger
67homepage: https://github.com/phadej/servant-swagger-ui#readme
78bug-reports: https://github.com/phadej/servant-swagger-ui/issues
89author: Oleg Grenrus <oleg.grenrus@iki.fi>
910maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
1011license: BSD3
1112license-file: LICENSE
12−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2
13+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
1314build-type: Simple
1415cabal-version: >= 1.10
1516
@@ -133,7 +134,7 @@ library
133134 src
134135 ghc-options: -Wall
135136 build-depends:
136− base >=4.7 && <4.10
137+ base >=4.7 && <4.11
137138 , blaze-markup >=0.7.0.2 && <0.9
138139 , bytestring >=0.10.4.0 && <0.11
139140 , directory >=1.2.1.0 && <1.4
@@ -145,7 +146,7 @@ library
145146 , servant-server >=0.4.4.5 && <0.12
146147 , servant-swagger >=1.0.3 && <1.2
147148 , swagger2 >=2.0.1 && <2.2
148− , template-haskell >=2.9 && <2.12
149+ , template-haskell >=2.9 && <2.13
149150 , text >=1.2.0.6 && <1.3
150151 , wai-app-static >=3.0.1.1 && <3.2
151152 if flag(servant-0-5)