aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2018-06-28 17:20:29 +0200
committerJohn MacFarlane <jgm@berkeley.edu>2018-06-28 17:20:29 +0200
commit72a76d51870de2da04f71172fbc23c0901738e28 (patch)
tree1df7ed78d04b727413c465ff836555595b1027a1 /.travis.yml
parentf6465e02a6277c9011d08fe84f6e3afff7da469f (diff)
downloadpandoc-72a76d51870de2da04f71172fbc23c0901738e28.tar.gz
Revert "travis: REALLY use cabal 2.2 with ghc 7.10."
This reverts commit f6465e02a6277c9011d08fe84f6e3afff7da469f.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 19e347c51..e790c893a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ matrix:
# don't build benchmarks for ghc 7.10.3, because build takes too long...
- env: BUILD=cabal GHCVER=7.10.3 CABALVER=2.2 OPTS="-O0 -Wall -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS=""
compiler: ": #GHC 7.10.3"
- addons: {apt: {packages: [cabal-install-2.2,ghc-7.10.3,happy-1.19.5], sources: [hvr-ghc]}}
+ addons: {apt: {packages: [cabal-install-2.0,ghc-7.10.3,happy-1.19.5], sources: [hvr-ghc]}}
# don't build benchmarks for ghc 8.0.2, because build takes too long...
- env: BUILD=cabal GHCVER=8.0.2 CABALVER=2.0 OPTS="-O0 -Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" FLAGS="fast" CABALARGS=""