@@ -2,7 +2,7 @@
3# runghc make_travis_yml_2.hs '--branch' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal'
3# runghc make_travis_yml_2.hs '--branch' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal'
5−# For more information, see https://github.com/hvr/multi-ghc-travis
5+# For more information, see https://github.com/haskell-CI/haskell-ci
@@ -32,18 +32,21 @@ before_cache:
35− - compiler: "ghc-8.4.3"
35+ - compiler: "ghc-8.6.1"
36 # env: TEST=--disable-tests BENCH=--disable-benchmarks
36 # 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]}}
38 - compiler: "ghc-8.2.2"
41 - compiler: "ghc-8.2.2"
39 # env: TEST=--disable-tests BENCH=--disable-benchmarks
42 # 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]}}
41 - compiler: "ghc-8.0.2"
44 - compiler: "ghc-8.0.2"
42 # env: TEST=--disable-tests BENCH=--disable-benchmarks
45 # 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]}}
44 - compiler: "ghc-7.10.3"
47 - compiler: "ghc-7.10.3"
45 # env: TEST=--disable-tests BENCH=--disable-benchmarks
48 # 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]}}
48before_install:
51before_install:
49 - HC=${CC}
52 - HC=${CC}
@@ -70,7 +73,7 @@ install:
70 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
73 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
71 - "printf 'packages: \".\"\\n' > cabal.project"
74 - "printf 'packages: \".\"\\n' > cabal.project"
72 - touch cabal.project.local
75 - 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"
74 - cat cabal.project || true
77 - cat cabal.project || true
75 - cat cabal.project.local || true
78 - cat cabal.project.local || true
76 - if [ -f "./configure.ac" ]; then
79 - if [ -f "./configure.ac" ]; then
@@ -86,13 +89,13 @@ install:
86# any command which exits with a non-zero exit code causes the build to fail.
89# any command which exits with a non-zero exit code causes the build to fail.
88 # test that source-distributions can be generated
91 # test that source-distributions can be generated
89− - (cd "." && cabal sdist)
92+ - cabal new-sdist all
90− - mv "."/dist/servant-quickcheck-*.tar.gz ${DISTDIR}/
93+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
91 - cd ${DISTDIR} || false
94 - cd ${DISTDIR} || false
92 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
95 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
93 - "printf 'packages: servant-quickcheck-*/*.cabal\\n' > cabal.project"
96 - "printf 'packages: servant-quickcheck-*/*.cabal\\n' > cabal.project"
94 - touch cabal.project.local
97 - 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"
96 - cat cabal.project || true
99 - cat cabal.project || true
97 - cat cabal.project.local || true
100 - cat cabal.project.local || true
98 # this builds all libraries and executables (without tests/benchmarks)
101 # this builds all libraries and executables (without tests/benchmarks)
@@ -106,7 +109,6 @@ script:
106 - (cd servant-quickcheck-* && cabal check)
109 - (cd servant-quickcheck-* && cabal check)
108 # haddock
111 # haddock
109− - rm -rf ./dist-newstyle
110 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
112 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
112 # Build without installed constraints for packages in global-db
114 # Build without installed constraints for packages in global-db