Skip to content

Commit 7c55040

Browse files
committed
Regenerate .travis.yml
This commit was performed automatically by a script. https://github.com/RyanGlScott/travis-maintenance
1 parent 10d3677 commit 7c55040

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

.travis.yml

+13-14
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,34 @@ matrix:
3838
include:
3939
- compiler: "ghc-8.6.1"
4040
# 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"
4343
# 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]}}
4545
- compiler: "ghc-8.2.2"
4646
# 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]}}
4848
- compiler: "ghc-8.0.2"
4949
# 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]}}
5151
- compiler: "ghc-7.10.3"
5252
# 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]}}
5454
- compiler: "ghc-7.8.4"
5555
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]}}
5757
- compiler: "ghc-7.6.3"
5858
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]}}
6060
- compiler: "ghc-7.4.2"
6161
# 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]}}
6363
- compiler: "ghc-7.2.2"
6464
# 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]}}
6666
- compiler: "ghc-7.0.4"
6767
# 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]}}
6969
- compiler: "ghc-head"
7070
env: GHCHEAD=true
7171
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}
@@ -131,8 +131,8 @@ install:
131131
# any command which exits with a non-zero exit code causes the build to fail.
132132
script:
133133
# 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}/
136136
- cd ${DISTDIR} || false
137137
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
138138
- "printf 'packages: mtl-*/*.cabal\\n' > cabal.project"
@@ -148,7 +148,6 @@ script:
148148
- (cd mtl-* && cabal check)
149149

150150
# haddock
151-
- rm -rf ./dist-newstyle
152151
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
153152

154153
# 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"]

mtl.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -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.3,
27+
GHC==8.4.4,
2828
GHC==8.6.1
2929

3030
source-repository head

0 commit comments

Comments
 (0)