@@ -7,6 +7,9 @@
11 submodules: false # whether to recursively clone submodules
14 submodules: false # whether to recursively clone submodules
@@ -28,9 +31,12 @@ before_cache:
31− - compiler: "ghc-8.4.2"
34+ - compiler: "ghc-8.6.1"
35+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
36+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
37+ - compiler: "ghc-8.4.4"
32 # env: TEST=--disable-tests BENCH=--disable-benchmarks
38 # env: TEST=--disable-tests BENCH=--disable-benchmarks
33− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.2], sources: [hvr-ghc]}}
39+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
34 - compiler: "ghc-8.2.2"
40 - compiler: "ghc-8.2.2"
35 # env: TEST=--disable-tests BENCH=--disable-benchmarks
41 # env: TEST=--disable-tests BENCH=--disable-benchmarks
36 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
42 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
@@ -88,8 +94,8 @@ install:
88# any command which exits with a non-zero exit code causes the build to fail.
94# any command which exits with a non-zero exit code causes the build to fail.
90 # test that source-distributions can be generated
96 # test that source-distributions can be generated
91− - (cd "." && cabal sdist)
97+ - cabal new-sdist all
92− - mv "."/dist/postgresql-simple-*.tar.gz ${DISTDIR}/
98+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
93 - cd ${DISTDIR} || false
99 - cd ${DISTDIR} || false
94 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
100 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
95 - "printf 'packages: postgresql-simple-*/*.cabal\\n' > cabal.project"
101 - "printf 'packages: postgresql-simple-*/*.cabal\\n' > cabal.project"
@@ -108,7 +114,6 @@ script:
108 - (cd postgresql-simple-* && cabal check)
114 - (cd postgresql-simple-* && cabal check)
110 # haddock
116 # haddock
111− - rm -rf ./dist-newstyle
112 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
117 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
114 # Build without installed constraints for packages in global-db
119 # Build without installed constraints for packages in global-db