git.iko.soy/servant-quickcheck
on master help sign in
Merge pull request #59 from haskell-servant/ghc-8.6

Support GHC-8.6

commit98fd048bdcbf788f37e5124dcd1b4715ae41f55c authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 15 Oct 2018, 21:13 (8 years ago) parentbc36737902d7a7
2 files changed+20−16
.travis.yml+13−11 servant-quickcheck.cabal+7−5
.travis.yml+13−11
@@ -2,7 +2,7 @@
22#
33# runghc make_travis_yml_2.hs '--branch' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal'
44#
5−# For more information, see https://github.com/hvr/multi-ghc-travis
5+# For more information, see https://github.com/haskell-CI/haskell-ci
66#
77language: c
88sudo: false
@@ -32,18 +32,21 @@ before_cache:
3232
3333matrix:
3434 include:
35− - compiler: "ghc-8.4.3"
35+ - compiler: "ghc-8.6.1"
3636 # env: TEST=--disable-tests BENCH=--disable-benchmarks
37− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
38+ - compiler: "ghc-8.4.4"
39+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
40+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
3841 - compiler: "ghc-8.2.2"
3942 # env: TEST=--disable-tests BENCH=--disable-benchmarks
40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
43+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4144 - compiler: "ghc-8.0.2"
4245 # env: TEST=--disable-tests BENCH=--disable-benchmarks
43− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
46+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4447 - compiler: "ghc-7.10.3"
4548 # env: TEST=--disable-tests BENCH=--disable-benchmarks
46− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
49+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
4750
4851before_install:
4952 - HC=${CC}
@@ -70,7 +73,7 @@ install:
7073 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7174 - "printf 'packages: \".\"\\n' > cabal.project"
7275 - touch cabal.project.local
73− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
76+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant-quickcheck | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
7477 - cat cabal.project || true
7578 - cat cabal.project.local || true
7679 - if [ -f "./configure.ac" ]; then
@@ -86,13 +89,13 @@ install:
8689# any command which exits with a non-zero exit code causes the build to fail.
8790script:
8891 # test that source-distributions can be generated
89− - (cd "." && cabal sdist)
90− - mv "."/dist/servant-quickcheck-*.tar.gz ${DISTDIR}/
92+ - cabal new-sdist all
93+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
9194 - cd ${DISTDIR} || false
9295 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
9396 - "printf 'packages: servant-quickcheck-*/*.cabal\\n' > cabal.project"
9497 - touch cabal.project.local
95− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
98+ - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant-quickcheck | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
9699 - cat cabal.project || true
97100 - cat cabal.project.local || true
98101 # this builds all libraries and executables (without tests/benchmarks)
@@ -106,7 +109,6 @@ script:
106109 - (cd servant-quickcheck-* && cabal check)
107110
108111 # haddock
109− - rm -rf ./dist-newstyle
110112 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
111113
112114 # Build without installed constraints for packages in global-db
servant-quickcheck.cabal+7−5
@@ -16,10 +16,12 @@ cabal-version: >=1.10
1616extra-source-files:
1717 CHANGELOG.yaml
1818tested-with:
19− GHC==7.10.3,
20− GHC==8.0.2,
21− GHC==8.2.2,
22− GHC==8.4.3
19+ GHC ==7.10.3
20+ || ==8.0.2
21+ || ==8.2.2
22+ || ==8.4.4
23+ || ==8.6.1
24+
2325
2426source-repository head
2527 type: git
@@ -37,7 +39,7 @@ library
3739 , Servant.QuickCheck.Internal.QuickCheck
3840 , Servant.QuickCheck.Internal.Equality
3941 , Servant.QuickCheck.Internal.ErrorTypes
40− build-depends: base >=4.8 && <4.12
42+ build-depends: base >=4.8 && <4.13
4143 , base-compat-batteries >= 0.10.1 && <0.11
4244 , aeson > 0.8 && < 2
4345 , bytestring == 0.10.*