git.iko.soy/typeable/swagger2
on master help sign in
Merge pull request #111 from phadej/travis-test

Travis test

commit7b86c9064ad02e2b2d2b7879e1b69babd50aea25 authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 24 Jul 2017, 17:21 (9 years ago) parent365b5ee5297441
3 files changed+24−23
.travis.yml+15−3 install-hspec-discover.sh−18 swagger2.cabal+9−2
.travis.yml+15−3
@@ -18,7 +18,6 @@ cache:
1818 directories:
1919 - $HOME/.cabal/packages
2020 - $HOME/.cabal/store
21− - $HOME/.local/bin
2221
2322before_cache:
2423 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
@@ -33,12 +32,15 @@ matrix:
3332 include:
3433 - compiler: "ghc-7.8.4"
3534 # env: TEST=--disable-tests BENCH=--disable-benchmarks
35+ env: HADDOCK=false
3636 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
3737 - compiler: "ghc-7.10.3"
3838 # env: TEST=--disable-tests BENCH=--disable-benchmarks
39+ env: HADDOCK=false
3940 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
4041 - compiler: "ghc-8.0.2"
4142 # env: TEST=--disable-tests BENCH=--disable-benchmarks
43+ env: HADDOCK=false
4244 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
4345 - compiler: "ghc-8.2.1"
4446 # env: TEST=--disable-tests BENCH=--disable-benchmarks
@@ -55,9 +57,10 @@ install:
5557 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
5658 - BENCH=${BENCH---enable-benchmarks}
5759 - TEST=${TEST---enable-tests}
60+ - HADDOCK=${HADDOCK-true}
61+ - INSTALLED=${INSTALLED-true}
5862 - travis_retry cabal update -v
5963 - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
60− - sh install-hspec-discover.sh # TEMP: we should use build-tools-depends
6164 - rm -fv cabal.project.local
6265 - "echo 'packages: .' > cabal.project"
6366 - rm -f cabal.project.freeze
@@ -84,8 +87,17 @@ script:
8487 # this builds all libraries and executables (including tests/benchmarks)
8588 # - rm -rf ./dist-newstyle
8689
87− # build & run tests
90+ # Build with installed constraints for packages in global-db
91+ - if $INSTALLED; then
92+ ghc-pkg list --simple-output --names-only | sed -r 's/([a-zA-Z0-9-]+*) */--constraint=\1 installed;/g' | sed 's/;$/;all/' | xargs -d ';' cabal new-build -w ${HC} --disable-tests --disable-benchmarks;
93+ else echo "Not building with installed constraints"; fi
94+
95+ # build & run tests, build benchmarks
8896 - cabal new-build -w ${HC} ${TEST} ${BENCH} all
8997 - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi
9098
99+ # haddock
100+ - rm -rf ./dist-newstyle
101+ - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
102+
91103# EOF
install-hspec-discover.shdeleted−18
@@ -1,18 +0,0 @@
1−#!/bin/sh
2−
3−set -ex
4−
5−if [ ! -e $HOME/.local/bin/hspec-discover ]; then
6− # Fetch the source
7− cabal get hspec-discover-2.4.4
8− cd hspec-discover-2.4.4
9−
10− # Set-up project
11− echo 'packages: .' > cabal.project
12−
13− # build exe
14− cabal new-build hspec-discover:exe:hspec-discover
15−
16− # copy executable to $HOME/.local/bin
17− cp $(find dist-newstyle -name hspec-discover -type f) $HOME/.local/bin
18−fi
swagger2.cabal+9−2
@@ -1,7 +1,11 @@
11name: swagger2
22version: 2.1.4.1
33synopsis: Swagger 2.0 data model
4−description: Please see README.md
4+description:
5+ This library is inteded to be used for decoding and encoding Swagger 2.0 API
6+ specifications as well as manipulating them.
7+ .
8+ The original Swagger 2.0 specification is available at http://swagger.io/specification/.
59homepage: https://github.com/GetShopTV/swagger2
610bug-reports: https://github.com/GetShopTV/swagger2/issues
711license: BSD3
@@ -9,7 +13,7 @@ license-file: LICENSE
913author: Nickolay Kudasov
1014maintainer: nickolay@getshoptv.com
1115copyright: (c) 2015-2016, GetShopTV
12−category: Web
16+category: Web, Swagger
1317build-type: Custom
1418extra-source-files:
1519 README.md
@@ -96,6 +100,9 @@ test-suite spec
96100 Data.Swagger.SchemaSpec
97101 Data.Swagger.Schema.ValidationSpec
98102 default-language: Haskell2010
103+ -- https://github.com/haskell/cabal/issues/3708
104+ build-tool-depends:
105+ hspec-discover:hspec-discover
99106
100107test-suite doctests
101108 -- See QuickCheck note in https://github.com/phadej/cabal-doctest#notes