@@ -38,34 +38,34 @@ matrix:
38
38
include :
39
39
- compiler : " ghc-8.6.1"
40
40
# env: TEST=--disable-tests BENCH=--disable-benchmarks
41
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-head ,ghc-8.6.1], sources: [hvr-ghc]}}
42
- - compiler : " ghc-8.4.3 "
41
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-8.6.1], sources: [hvr-ghc]}}
42
+ - compiler : " ghc-8.4.4 "
43
43
# env: TEST=--disable-tests BENCH=--disable-benchmarks
44
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.2 ,ghc-8.4.3 ], sources: [hvr-ghc]}}
44
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-8.4.4 ], sources: [hvr-ghc]}}
45
45
- compiler : " ghc-8.2.2"
46
46
# env: TEST=--disable-tests BENCH=--disable-benchmarks
47
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.2 ,ghc-8.2.2], sources: [hvr-ghc]}}
47
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-8.2.2], sources: [hvr-ghc]}}
48
48
- compiler : " ghc-8.0.2"
49
49
# env: TEST=--disable-tests BENCH=--disable-benchmarks
50
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.2 ,ghc-8.0.2], sources: [hvr-ghc]}}
50
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-8.0.2], sources: [hvr-ghc]}}
51
51
- compiler : " ghc-7.10.3"
52
52
# env: TEST=--disable-tests BENCH=--disable-benchmarks
53
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.2 ,ghc-7.10.3], sources: [hvr-ghc]}}
53
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-7.10.3], sources: [hvr-ghc]}}
54
54
- compiler : " ghc-7.8.4"
55
55
env : NOINSTALLEDCONSTRAINTS=true
56
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.2 ,ghc-7.8.4], sources: [hvr-ghc]}}
56
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-7.8.4], sources: [hvr-ghc]}}
57
57
- compiler : " ghc-7.6.3"
58
58
env : HADDOCK=false
59
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.2 ,ghc-7.6.3], sources: [hvr-ghc]}}
59
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-7.6.3], sources: [hvr-ghc]}}
60
60
- compiler : " ghc-7.4.2"
61
61
# env: TEST=--disable-tests BENCH=--disable-benchmarks
62
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.2 ,ghc-7.4.2], sources: [hvr-ghc]}}
62
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-7.4.2], sources: [hvr-ghc]}}
63
63
- compiler : " ghc-7.2.2"
64
64
# env: TEST=--disable-tests BENCH=--disable-benchmarks
65
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.2 ,ghc-7.2.2], sources: [hvr-ghc]}}
65
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-7.2.2], sources: [hvr-ghc]}}
66
66
- compiler : " ghc-7.0.4"
67
67
# env: TEST=--disable-tests BENCH=--disable-benchmarks
68
- addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.2 ,ghc-7.0.4], sources: [hvr-ghc]}}
68
+ addons : {apt: {packages: [ghc-ppa-tools,cabal-install-2.4 ,ghc-7.0.4], sources: [hvr-ghc]}}
69
69
- compiler : " ghc-head"
70
70
env : GHCHEAD=true
71
71
addons : {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
@@ -131,8 +131,8 @@ install:
131
131
# any command which exits with a non-zero exit code causes the build to fail.
132
132
script :
133
133
# test that source-distributions can be generated
134
- - (cd "." && cabal sdist)
135
- - mv "."/ dist/mtl- *.tar.gz ${DISTDIR}/
134
+ - cabal new- sdist all
135
+ - mv dist-newstyle/sdist/ *.tar.gz ${DISTDIR}/
136
136
- cd ${DISTDIR} || false
137
137
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
138
138
- " printf 'packages: mtl-*/*.cabal\\ n' > cabal.project"
@@ -148,7 +148,6 @@ script:
148
148
- (cd mtl-* && cabal check)
149
149
150
150
# haddock
151
- - rm -rf ./dist-newstyle
152
151
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
153
152
154
153
# REGENDATA ["-o",".travis.yml","--ghc-head","--irc-channel=irc.freenode.org#haskell-lens","--no-no-tests-no-bench","--no-unconstrained","--env=7.6.3:HADDOCK=false","--env=7.8.4:NOINSTALLEDCONSTRAINTS=true","cabal.project"]
0 commit comments