diff options
author | John MacFarlane <jgm@berkeley.edu> | 2015-08-15 11:13:29 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2015-08-15 11:13:29 -0700 |
commit | b725b45c83fa5ad767cc939541174cf906f12d55 (patch) | |
tree | 3c8c8591af384b41fd664df79decad340c78bf9b | |
parent | 3a9352957af02c91b29e2ff0986f3c2d205b3106 (diff) | |
download | pandoc-b725b45c83fa5ad767cc939541174cf906f12d55.tar.gz |
Travis: removed diagnostics, add cabal path to PATH, back to ghc 7.10.1.
ghc 7.10.2 isn't whitelisted yet.
https://github.com/travis-ci/travis-ci/issues/4478
-rw-r--r-- | .travis.yml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index cb344b271..112a300aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,20 +12,16 @@ 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.2 GHCOPTS="" JOPTS="-j2" - addons: {apt: {packages: [cabal-install-1.22, ghc-7.10.2],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=head GHCOPTS="-Werror" JOPTS="-j2" # addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}} # Note: the distinction between `before_install` and `install` is not important. before_install: - - export PATH=/opt/ghc/$GHCVER/bin:$PATH + - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH install: - # diagnostics: - - echo $PATH - - ls /opt/ghc/ - - which ghc - cabal-$CABALVER update # - git clone https://github.com/jgm/pandoc-types && cd pandoc-types && cabal-1.18 install && cd .. - cabal-$CABALVER install $JOPTS --only-dependencies --enable-tests |