[commit: haddock] master, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3: Ignore warnings, install Cabal 1.22 (7b65f55)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: master,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3
Link       : http://git.haskell.org/haddock.git/commitdiff/7b65f556c1087f205eaa45b8592dfa687e78c669

>---------------------------------------------------------------

commit 7b65f556c1087f205eaa45b8592dfa687e78c669
Author: JP Moresmau <jp at moresmau.fr>
Date:   Wed Jan 21 16:34:08 2015 +0100

    Ignore warnings, install Cabal 1.22


>---------------------------------------------------------------

7b65f556c1087f205eaa45b8592dfa687e78c669
 .travis.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f0b7eb1..ab3388c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,14 +10,18 @@ before_install:
  - sudo apt-get update
  - sudo apt-get install ghc-$GHCVER
  - export PATH=/opt/ghc/$GHCVER/bin:$PATH
+ - sudo apt-get install cabal-install-1.22
+ - export PATH=/opt/cabal/1.22/bin:$PATH
+ - cabal --version
  - cd haddock-library
  - cabal install --only-dependencies --enable-tests
  - cabal install doctest
- - cabal configure --enable-tests --ghc-options=-Werror && cabal build && cabal test
+ # --ghc-options=-Werror
+ - cabal configure --enable-tests && cabal build && cabal test
  - doctest -isrc -i$(echo vendor/attoparsec-*) -optP-include -optPdist/build/autogen/cabal_macros.h src/Documentation/Haddock/Parser.hs
  - cabal install
  - cd ..
- - (cd haddock-api/ && cabal install --only-dependencies --enable-tests && cabal configure --enable-tests --ghc-options=-Werror && cabal build && cabal test && cabal install)
+ - (cd haddock-api/ && cabal install --only-dependencies --enable-tests && cabal configure --enable-tests && cabal build && cabal test && cabal install)
 
 script:
- - cabal configure --enable-tests --ghc-options=-Werror && cabal build && cabal test
+ - cabal configure --enable-tests && cabal build && cabal test