1 files changed, 27 insertions, 33 deletions

diff --git a/.travis.yml b/.travis.yml
index ebc8207..618741d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,51 +1,45 @@
-# NB: don't set `language: haskell` here
+# See also https://github.com/hvr/multi-ghc-travis for more information
 language: c
 
-# See also https://github.com/hvr/multi-ghc-travis for more information
+sudo: false
 
 # The following lines enable several GHC versions and/or HP versions
 # to be tested; often it's enough to test only against the last
 # release of a major GHC version. Setting HPVER implictly sets
 # GHCVER. Omit lines with versions you don't need/want testing for.
-env:
- - CABALVER=1.22 GHCVER=7.10.1
+matrix:
+   include:
+   - env: CABALVER=1.18 GHCVER=7.8.4 CTOPTS=""
+     addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
+   - env: CABALVER=1.22 GHCVER=7.10.1 CTOPTS="--show-details=streaming"
+     addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}}
+   - env: CABALVER=head GHCVER=head CTOPTS="--show-details=streaming"
+     addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
+
+   allow_failures:
+      - env: CABALVER=head GHCVER=head
 
-# Note: the distinction between `before_install` and `install` is not
-#       important.
 before_install:
- - 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
+   - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
 
 install:
- - cabal --version
- - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- - travis_retry cabal update
- - cabal install hpc-coveralls
- - cabal install --only-dependencies --enable-tests --enable-benchmarks --enable-coverage
-
-# 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.
+   - cabal --version
+   - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+   - travis_retry cabal update
+   - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config # The container environment reports 16 cores
+   - cabal install --only-dependencies --enable-tests --enable-benchmarks
+
 script:
- # -v2 provides useful information for debugging
- - cabal configure --enable-tests --enable-benchmarks -v2
+   - cabal configure --enable-tests --enable-benchmarks -v2
+   - cabal build
 
- # this builds all libraries and executables
- # (including tests/benchmarks)
- - cabal build
+   - cabal test $CTOPTS
 
- - run-cabal-test --show-details=streaming
- - cabal check
+   - cabal check
 
- # tests that a source-distribution can be generated
- - cabal sdist
+   - cabal sdist
 
- # check that the generated source-distribution can be built & installed
- - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
-   (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
+   - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
+     (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
 
-after_script: 
-   - hpc-coveralls test
 # EOF