[commit: packages/directory] improve-tests, improve-tests-for-real, master, tmp: Update Travis CI job (a872d1b)

[git at git.haskell.org]

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

On branches: improve-tests,improve-tests-for-real,master,tmp
Link       : http://ghc.haskell.org/trac/ghc/changeset/a872d1bdfb79d4d51cc97e62a65d0703c07f0e29/directory

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

commit a872d1bdfb79d4d51cc97e62a65d0703c07f0e29
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Nov 1 11:54:09 2014 +0100

    Update Travis CI job


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

a872d1bdfb79d4d51cc97e62a65d0703c07f0e29
 .travis.yml | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c62e226..ea01c3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,39 @@
 env:
- - GHCVER=7.4.1
- - GHCVER=7.4.2
- - GHCVER=7.6.1
- - GHCVER=7.6.2
- - GHCVER=7.6.3
+ # we have to use CABALVER=1.16 for GHC<7.6 as well, as there's
+ # no package for earlier cabal versions in the PPA
+ - GHCVER=7.4.1 CABALVER=1.16
+ - GHCVER=7.4.2 CABALVER=1.16
+ - GHCVER=7.6.3 CABALVER=1.16
+ - GHCVER=7.8.3 CABALVER=1.18
+ - GHCVER=head  CABALVER=head
+
+matrix:
+  allow_failures:
+   - env: GHCVER=head  CABALVER=head
 
 before_install:
- - sudo add-apt-repository -y ppa:hvr/ghc
- - sudo apt-get update
- - sudo apt-get install cabal-install-1.18 ghc-$GHCVER autoconf
- - export PATH=/opt/ghc/$GHCVER/bin:$PATH
+ - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
+ - travis_retry sudo apt-get update
+ - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+ - cabal --version
 
 install:
- - cabal-1.18 update
- - cabal-1.18 install --only-dependencies
+ - travis_retry cabal update
+ - cabal install --only-dependencies
  - ghc --version
 
 script:
  - autoreconf -i
- - cabal-1.18 configure -v2
- - cabal-1.18 build
- - cabal-1.18 check
- - cabal-1.18 sdist
-
+ - cabal configure -v2
+ - cabal build
+ - cabal check
+ - cabal sdist
 # The following scriptlet checks that the resulting source distribution can be built & installed
- - export SRC_TGZ=$(cabal-1.18 info . | awk '{print $2 ".tar.gz";exit}') ;
+ - export SRC_TGZ=$(cabal info . | awk '{print $2 ".tar.gz";exit}') ;
    cd dist/;
    if [ -f "$SRC_TGZ" ]; then
-      cabal-1.18 install "$SRC_TGZ";
+      cabal install --force-reinstalls "$SRC_TGZ";
    else
       echo "expected '$SRC_TGZ' not found";
       exit 1;