git.iko.soy/typeable/http-api-data
on master help sign in
Merge pull request #76 from phadej/updates

Allow doctest-0.16, update .travis.yml

commiteb1deccbaf3d15eb8d7eca25e11930d24f6b16f3 authorOleg Grenrus <oleg.grenrus@iki.fi> dateThu 5 Jul 2018, 15:27 (8 years ago) parentffac6a58baa02d
2 files changed+31−17
.travis.yml+29−15 http-api-data.cabal+2−2
.travis.yml+29−15
@@ -32,21 +32,21 @@ before_cache:
3232
3333matrix:
3434 include:
35− - compiler: "ghc-7.8.4"
35+ - compiler: "ghc-8.4.3"
3636 # env: TEST=--disable-tests BENCH=--disable-benchmarks
37− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}}
38− - compiler: "ghc-7.10.3"
37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
38+ - compiler: "ghc-8.2.2"
3939 # env: TEST=--disable-tests BENCH=--disable-benchmarks
40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}
40+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
4141 - compiler: "ghc-8.0.2"
4242 # env: TEST=--disable-tests BENCH=--disable-benchmarks
43− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
44− - compiler: "ghc-8.2.2"
43+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
44+ - compiler: "ghc-7.10.3"
4545 # env: TEST=--disable-tests BENCH=--disable-benchmarks
46− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
47− - compiler: "ghc-8.4.1"
46+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
47+ - compiler: "ghc-7.8.4"
4848 # env: TEST=--disable-tests BENCH=--disable-benchmarks
49− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
49+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
5050
5151before_install:
5252 - HC=${CC}
@@ -64,7 +64,8 @@ install:
6464 - BENCH=${BENCH---enable-benchmarks}
6565 - TEST=${TEST---enable-tests}
6666 - HADDOCK=${HADDOCK-true}
67− - INSTALLED=${INSTALLED-true}
67+ - UNCONSTRAINED=${UNCONSTRAINED-true}
68+ - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
6869 - GHCHEAD=${GHCHEAD-false}
6970 - travis_retry cabal update -v
7071 - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
@@ -72,7 +73,10 @@ install:
7273 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
7374 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7475 - "printf 'packages: \".\"\\n' > cabal.project"
75− - cat cabal.project
76+ - touch cabal.project.local
77+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- http-api-data | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
78+ - cat cabal.project || true
79+ - cat cabal.project.local || true
7680 - if [ -f "./configure.ac" ]; then
7781 (cd "." && autoreconf -i);
7882 fi
@@ -91,13 +95,13 @@ script:
9195 - cd ${DISTDIR} || false
9296 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
9397 - "printf 'packages: http-api-data-*/*.cabal\\n' > cabal.project"
94− - cat cabal.project
98+ - touch cabal.project.local
99+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- http-api-data | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
100+ - cat cabal.project || true
101+ - cat cabal.project.local || true
95102 # this builds all libraries and executables (without tests/benchmarks)
96103 - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
97104
98− # Build with installed constraints for packages in global-db
99− - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
100−
101105 # build & run tests, build benchmarks
102106 - cabal new-build -w ${HC} ${TEST} ${BENCH} all
103107 - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
@@ -109,11 +113,21 @@ script:
109113 - rm -rf ./dist-newstyle
110114 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
111115
116+ # Build without installed constraints for packages in global-db
117+ - 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
118+
119+ # Constraint sets
120+ - rm -rf cabal.project.local
121+
122+ # Constraint set lower-bounds-7.8.4
112123 - if [ $HCNUMVER -eq 70804 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='attoparsec ==0.13.0.1' --constraint='attoparsec-iso8601 ==1.0.0.0' --constraint='bytestring ==0.10.4.0' --constraint='containers ==0.5.5.1' --constraint='hashable ==1.1.2.4' --constraint='http-types ==0.8.6' --constraint='semigroups ==0.16' --constraint='text ==1.1.1.3' --constraint='time ==1.4.2' --constraint='time-local-compat ==0.1.1.0' --constraint='unordered-containers ==0.2.6.0' --constraint='uri-bytestring ==0.1.7' --constraint='uuid-types ==1.0.2' all; else echo skipping...; fi
113124
125+ # Constraint set lower-bounds-7.10.3
114126 - if [ $HCNUMVER -eq 71003 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='attoparsec ==0.13.0.1' --constraint='attoparsec-iso8601 ==1.0.0.0' --constraint='bytestring ==0.10.6.0' --constraint='containers ==0.5.6.1' --constraint='hashable ==1.2.3.2' --constraint='http-types ==0.8.6' --constraint='semigroups ==0.16.0.1' --constraint='text ==1.2.0.2' --constraint='time ==1.5.0.1' --constraint='time-local-compat ==0.1.1.0' --constraint='unordered-containers ==0.2.6.0' --constraint='uri-bytestring ==0.1.7' --constraint='uuid-types ==1.0.2' all; else echo skipping...; fi
115127
128+ # Constraint set lower-bounds-8.0.2
116129 - if [ $HCNUMVER -eq 80002 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='attoparsec ==0.13.0.1' --constraint='attoparsec-iso8601 ==1.0.0.0' --constraint='bytestring ==0.10.6.0' --constraint='containers ==0.5.7.0' --constraint='hashable ==1.2.4.0' --constraint='http-types ==0.8.6' --constraint='text ==1.2.2.0' --constraint='time ==1.5.0.1' --constraint='time-local-compat ==0.1.1.0' --constraint='unordered-containers ==0.2.6.0' --constraint='uri-bytestring ==0.2.1.0' --constraint='uuid-types ==1.0.2' all; else echo skipping...; fi
117130
131+
118132# REGENDATA ["--config","--output",".travis.yml","http-api-data.cabal"]
119133# EOF
http-api-data.cabal+2−2
@@ -24,7 +24,7 @@ tested-with:
2424 GHC==7.10.3,
2525 GHC==8.0.2,
2626 GHC==8.2.2,
27− GHC==8.4.1
27+ GHC==8.4.3
2828
2929custom-setup
3030 setup-depends:
@@ -95,7 +95,7 @@ test-suite doctests
9595 build-depends:
9696 base,
9797 directory >= 1.0,
98− doctest >= 0.11 && <0.16,
98+ doctest >= 0.11 && <0.17,
9999 filepath
100100 default-language: Haskell2010
101101 hs-source-dirs: test