aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-08-15 11:50:07 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-08-15 11:50:07 -0700
commit1e17922b95c2d8289ced7b1d75ace377bdddbb70 (patch)
tree78c4ffaf78532635136e52e8a695cdca002c1c2b /.travis.yml
parentb725b45c83fa5ad767cc939541174cf906f12d55 (diff)
downloadpandoc-1e17922b95c2d8289ced7b1d75ace377bdddbb70.tar.gz
Use cabal-install-head in travis for ghc 7.10.1.
See https://www.reddit.com/r/haskell/comments/3f4bgr/the_version_of_cabal_being_used_has_changed/ Maybe this will fix the Cabal version mismatch problem?
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 112a300aa..4979593d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ matrix:
addons: {apt: {packages: [cabal-install-1.18, ghc-7.6.3], sources: [hvr-ghc]}}
- env: CABALVER=1.18 GHCVER=7.8.4 GHCOPTS="-Werror" JOPTS="-j2"
addons: {apt: {packages: [cabal-install-1.18, ghc-7.8.4], sources: [hvr-ghc]}}
- - env: CABALVER=1.22 GHCVER=7.10.1 GHCOPTS="" JOPTS="-j2"
- addons: {apt: {packages: [cabal-install-1.22, ghc-7.10.1],sources: [hvr-ghc]}}
+ - env: CABALVER=head GHCVER=7.10.1 GHCOPTS="" JOPTS="-j2"
+ addons: {apt: {packages: [cabal-install-head, ghc-7.10.1],sources: [hvr-ghc]}}
# - env: CABALVER=head GHCVER=head GHCOPTS="-Werror" JOPTS="-j2"
# addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}