diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-10-01 21:12:01 +0200 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-10-01 21:12:01 +0200 |
| commit | f49ed2e71a11023b09556f0fdf58abab90a675d8 (patch) | |
| tree | ac28fe29782ddbdcf137d32e07df06b9bfd24fdd | |
| parent | 9a2d92a39566baa4f0720941b22d2cb6a8592571 (diff) | |
| download | pandoc-f49ed2e71a11023b09556f0fdf58abab90a675d8.tar.gz | |
Removed cabal 1.16 cruft from .travis.yml.
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 37ea4fbb3..b9f3163a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -111,13 +111,11 @@ script: cabal) cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options="-O0 -Werror" cabal build - cabal check || [ "$CABALVER" == "1.16" ] + cabal check cabal test cabal copy - # cabal sdist fails on cabal 1.16: - cabal sdist || [ "$CABALVER" == "1.16" ] + cabal sdist SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && \ - (cd dist && cabal install --enable-tests --force-reinstalls "$SRC_TGZ" || \ - [ "$CABALVER" == "1.16" ]) + (cd dist && cabal install --enable-tests --force-reinstalls "$SRC_TGZ") ;; esac |