Rearranged Travis CI configuration. Use Cabal head with GHC 7.8.3/head.

Author: svenpanne

.travis.yml

@@ -1,42 +1,45 @@
 env:
- global:
-  - CABALVER=1.20
- matrix:
-  - GHCVER=7.0.4
-  - GHCVER=7.2.2
-  - GHCVER=7.4.2
-  - GHCVER=7.6.3
-  - GHCVER=7.8.3
-  - GHCVER=head
+ - CABALVER=1.20 GHCVER=7.0.4
+ - CABALVER=1.20 GHCVER=7.2.2
+ - CABALVER=1.20 GHCVER=7.4.2
+ - CABALVER=1.20 GHCVER=7.6.3
+ - CABALVER=1.20 GHCVER=7.8.3
+ - CABALVER=head GHCVER=7.8.3
+ - CABALVER=head GHCVER=head
 
 matrix:
  allow_failures:
-  - env: GHCVER=head
+  - env: CABALVER=head GHCVER=head
 
 before_install:
  - sudo add-apt-repository -y ppa:hvr/ghc
  - sudo apt-get update -qq
- - sudo apt-get install -qq cabal-install-$CABALVER ghc-$GHCVER
- - export PATH="/opt/ghc/$GHCVER/bin:$PATH"
 
 install:
- - cabal-$CABALVER update
+ - sudo apt-get install -qq cabal-install-$CABALVER ghc-$GHCVER
+ - export PATH="/opt/cabal/$CABALVER/bin:/opt/ghc/$GHCVER/bin:$PATH"
+
+before_script:
+ - cabal --version
+ - cabal update
  - ghc --version
  - ghc-pkg list
  - pushd ..
  - git clone --depth=100 --quiet https://github.com/haskell-opengl/OpenGLRaw.git
  - cd OpenGLRaw
- - cabal-$CABALVER install --enable-documentation
+ - cabal install --enable-documentation
  - popd
  - ghc-pkg list
  - pushd ..
  - git clone --depth=100 --quiet https://github.com/haskell-opengl/GLURaw.git
  - cd GLURaw
- - cabal-$CABALVER install --enable-documentation
+ - cabal install --enable-documentation
  - popd
  - ghc-pkg list
 
 script:
- - cabal-$CABALVER install --enable-documentation
- - cabal-$CABALVER sdist
+ - cabal install --enable-documentation
+ - cabal sdist
+
+after_script:
  - ghc-pkg list