From 80f2f9805b61e8cea291bae8ce22db626dc11f21 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sat, 26 Dec 2015 10:45:27 +0100
Subject: travis: Use Travis containers

---
 .travis.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 585b0b25..7fb97c8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,17 @@
-language: haskell
+sudo: false
 
-env:
- # - GHCVER=7.8.2
- # - GHCVER=7.8.3
- - GHCVER=7.10.2
+matrix:
+  include:
+    - env: CABALVER=head GHCVER=head
+      addons: {apt: {packages: [cabal-install-head,ghc-head],  sources: [hvr-ghc]}}
+
+  allow_failures:
+    - env: CABALVER=head GHCVER=head
 
 before_install:
- - sudo add-apt-repository -y ppa:hvr/ghc
- - 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
+ - export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
  - cabal --version
+ - cabal update
  - cd haddock-library
  - cabal install --only-dependencies --enable-tests
  - cabal install doctest
@@ -22,8 +21,6 @@ before_install:
  - cabal install
  - cd ..
  - (cd haddock-api/ && cabal install --only-dependencies --enable-tests && cabal configure --enable-tests && cabal build && cabal test && cabal install)
- - (cd haddock-test/ && cabal install --only-dependencies && cabal configure && cabal build && cabal install)
 
 script:
- - export HADDOCK_PATH="dist/build/haddock/haddock"
- - cabal configure --enable-tests && cabal build && cabal test
+ - cabal configure --enable-tests && cabal build && cabal test
\ No newline at end of file
-- 
cgit v1.2.3