[commit: packages/directory] master: Migrate Travis to containerized infrastructure (77d34ee)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/77d34ee1ebd9ef58e1afb6052909095dca9aade0/directory

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

commit 77d34ee1ebd9ef58e1afb6052909095dca9aade0
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Aug 20 18:20:18 2015 -0400

    Migrate Travis to containerized infrastructure
    
    Additionally,
    
      - removed 7.4.1, and
      - upgraded 7.8.3 to 7.8.4.


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

77d34ee1ebd9ef58e1afb6052909095dca9aade0
 .travis.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 19c998f..5b9766f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,26 @@
 # we want to use our custom environment, but the Travis YAML validator
 # requires this field to be specified, so we'll just use 'c'
 language: c
-env:
- # 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=7.10.1 CABALVER=1.22
- - GHCVER=head   CABALVER=head
+
+# use the new container-based infrastructure
+sudo: false
+
+matrix:
+  include:
+   # 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
+   - env: GHCVER=7.4.2 CABALVER=1.16
+     addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
+   - env: GHCVER=7.6.3 CABALVER=1.16
+     addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
+   - env: GHCVER=7.8.4 CABALVER=1.18
+     addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
+   - env: GHCVER=7.10.1 CABALVER=1.22
+     addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1], sources: [hvr-ghc]}}
+   - env: GHCVER=head CABALVER=head
+     addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
 
 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
  - cabal --version