Merged changes from multi-ghc-travis

Author: sebright

.travis.yml

@@ -10,19 +10,23 @@
 # release of a major GHC version. Setting HPVER implictly sets
 # GHCVER. Omit lines with versions you don't need/want testing for.
 env:
- # - GHCVER=6.12.3
- - GHCVER=7.0.1 AESONVER=0.6.0.0
- # - GHCVER=7.0.2
- # - GHCVER=7.0.3
- # - GHCVER=7.0.4
- # - GHCVER=7.2.1
- # - GHCVER=7.2.2
- # - GHCVER=7.4.1
- # - GHCVER=7.4.2
- # - GHCVER=7.6.1
- - GHCVER=7.6.2 AESONVER=0.7.0.0
- - GHCVER=7.6.3 AESONVER=0.8.0.0
- # - GHCVER=7.8.1
+ # - CABALVER=1.16 GHCVER=6.12.3
+ - CABALVER=1.16 GHCVER=7.0.1 AESONVER=0.6.0.0
+ # - CABALVER=1.16 GHCVER=7.0.2
+ # - CABALVER=1.16 GHCVER=7.0.3
+ # - CABALVER=1.16 GHCVER=7.0.4
+ # - CABALVER=1.16 GHCVER=7.2.1
+ # - CABALVER=1.16 GHCVER=7.2.2
+ # - CABALVER=1.16 GHCVER=7.4.1
+ # - CABALVER=1.16 GHCVER=7.4.2
+ # - CABALVER=1.16 GHCVER=7.6.1
+ - CABALVER=1.16 GHCVER=7.6.2 AESONVER=0.7.0.4
+ - CABALVER=1.18 GHCVER=7.6.3 AESONVER=0.8.0.2
+ # - CABALVER=1.18 GHCVER=7.8.1
+ # - CABALVER=1.18 GHCVER=7.8.2
+ # - CABALVER=1.18 GHCVER=7.8.3
+ # - CABALVER=1.22 GHCVER=7.10.1
+# - CABALVER=head GHCVER=head
  - HPVER=2014.2.0.0
  # - HPVER=2013.2.0.0
  # - HPVER=2012.4.0.0
@@ -36,22 +40,27 @@ before_install:
     "") ;;
 
     "2014.2.0.0")
+      export CABALVER=1.18 ;
       export GHCVER=7.8.3 ;
       echo "constraints:async==2.0.1.5,attoparsec==0.10.4.0,case-insensitive==1.1.0.3,fgl==5.5.0.1,GLUT==2.5.1.1,GLURaw==1.4.0.1,haskell-src==1.0.1.6,hashable==1.2.2.0,html==1.0.1.2,HTTP==4000.2.10,HUnit==1.2.5.2,mtl==2.1.3.1,network==2.4.2.3,OpenGL==2.9.2.0,OpenGLRaw==1.5.0.0,parallel==3.2.0.4,parsec==3.1.5,primitive==0.5.2.1,QuickCheck==2.6,random==1.0.1.1,regex-base==0.93.2,regex-compat==0.95.1,regex-posix==0.95.2,split==0.2.2,stm==2.4.2,syb==0.4.1,text==1.1.0.0,transformers==0.3.0.0,unordered-containers==0.2.4.0,vector==0.10.9.1,xhtml==3000.2.1,zlib==0.5.4.1" > cabal.config ;;
 
     "2013.2.0.0")
+      export CABALVER=1.16 ;
       export GHCVER=7.6.3 ;
       echo "constraints:async==2.0.1.4,attoparsec==0.10.4.0,case-insensitive==1.0.0.1,cgi==3001.1.7.5,fgl==5.4.2.4,GLUT==2.4.0.0,GLURaw==1.3.0.0,haskell-src==1.0.1.5,hashable==1.1.2.5,html==1.0.1.2,HTTP==4000.2.8,HUnit==1.2.5.2,mtl==2.1.2,network==2.4.1.2,OpenGL==2.8.0.0,OpenGLRaw==1.3.0.0,parallel==3.2.0.3,parsec==3.1.3,QuickCheck==2.6,random==1.0.1.1,regex-base==0.93.2,regex-compat==0.95.1,regex-posix==0.95.2,split==0.2.2,stm==2.4.2,syb==0.4.0,text==0.11.3.1,transformers==0.3.0.0,unordered-containers==0.2.3.0,vector==0.10.0.1,xhtml==3000.2.1,zlib==0.5.4.1" > cabal.config ;;
 
     "2012.4.0.0")
+      export CABALVER=1.16 ;
       export GHCVER=7.6.2 ;
       echo "constraints:async==2.0.1.3,cgi==3001.1.7.4,fgl==5.4.2.4,GLUT==2.1.2.1,haskell-src==1.0.1.5,html==1.0.1.2,HTTP==4000.2.5,HUnit==1.2.5.1,mtl==2.1.2,network==2.3.1.0,OpenGL==2.2.3.1,parallel==3.2.0.3,parsec==3.1.3,QuickCheck==2.5.1.1,random==1.0.1.1,regex-base==0.93.2,regex-compat==0.95.1,regex-posix==0.95.2,split==0.2.1.1,stm==2.4,syb==0.3.7,text==0.11.2.3,transformers==0.3.0.0,vector==0.10.0.1,xhtml==3000.2.1,zlib==0.5.4.0" > cabal.config ;;
 
     "2012.2.0.0")
+      export CABALVER=1.16 ;
       export GHCVER=7.4.1 ;
       echo "constraints:cgi==3001.1.7.4,fgl==5.4.2.4,GLUT==2.1.2.1,haskell-src==1.0.1.5,html==1.0.1.2,HTTP==4000.2.3,HUnit==1.2.4.2,mtl==2.1.1,network==2.3.0.13,OpenGL==2.2.3.1,parallel==3.2.0.2,parsec==3.1.2,QuickCheck==2.4.2,random==1.0.1.1,regex-base==0.93.2,regex-compat==0.95.1,regex-posix==0.95.1,stm==2.3,syb==0.3.6.1,text==0.11.2.0,transformers==0.3.0.0,xhtml==3000.2.1,zlib==0.5.3.3" > cabal.config ;;
 
     "2011.4.0.0")
+      export CABALVER=1.16 ;
       export GHCVER=7.0.4 ;
       echo "constraints:cgi==3001.1.7.4,fgl==5.4.2.4,GLUT==2.1.2.1,haskell-src==1.0.1.4,html==1.0.1.2,HUnit==1.2.4.2,network==2.3.0.5,OpenGL==2.2.3.0,parallel==3.1.0.1,parsec==3.1.1,QuickCheck==2.4.1.1,regex-base==0.93.2,regex-compat==0.95.1,regex-posix==0.95.1,stm==2.2.0.1,syb==0.3.3,xhtml==3000.2.0.4,zlib==0.5.3.1,HTTP==4000.1.2,deepseq==1.1.0.2" > cabal.config ;;
 
@@ -63,52 +72,55 @@ before_install:
    esac
 
    if [ -n "$AESONVER" ]; then
-      echo "constraints:aeson=="$AESONVER >> cabal.config;
+       echo "constraints:aeson=="$AESONVER >> cabal.config;
    fi
 
    if [ "$AESONVER" = "0.6.0.0" ]; then
        echo "constraints:attoparsec==0.8.6.1,blaze-builder==0.2.1.4,bytestring==0.9.1.8,hashable==1.1.2.0,mtl==1.1.1.0,network==2.3.0.1,test-framework-hunit==0.3.0,text==0.11.1.1,unordered-containers==0.1.3.0,vector==0.7.1,zlib==0.5.2.0" >> cabal.config;
    fi
 
- - sudo add-apt-repository -y ppa:hvr/ghc
- - sudo apt-get update
- - sudo apt-get install cabal-install-1.18 ghc-$GHCVER
- - 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
 
 install:
- - cabal-1.18 update
- - cabal-1.18 install --only-dependencies --enable-tests
+ - cabal --version
+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - travis_retry cabal update
+ - cabal install --only-dependencies --enable-tests
 
 # Here starts the actual work to be performed for the package under
 # test; any command which exits with a non-zero exit code causes the
 # build to fail.
 script:
+ - if [ -f configure.ac ]; then autoreconf -i; fi
  # -v2 provides useful information for debugging
- - cabal-1.18 configure --enable-tests -v2
+ - cabal configure --enable-tests -v2
 
  # this builds all libraries and executables
  # (including tests)
- - cabal-1.18 build --ghc-options=-Werror
+ - cabal build --ghc-options=-Werror
 
- - cabal-1.18 test
- - cabal-1.18 check
+ - cabal test
+ - cabal check
 
  # tests that a source-distribution can be generated
- - cabal-1.18 sdist
+ - cabal sdist
 
  # check that the generated 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}') ;
    cp cabal.config dist;
    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;
    fi
 
  # build demo
  - cd ..;
-   cabal-1.18 install -f demo;
+   cabal install -f demo;
 
 # EOF