[commit: packages/process] better-travis: Switch to Travis caching (0fe32ff)

[git at git.haskell.org]

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

On branch  : better-travis
Link       : http://ghc.haskell.org/trac/ghc/changeset/0fe32ff1fa74a63086363ce111b99373d687432f/process

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

commit 0fe32ff1fa74a63086363ce111b99373d687432f
Author: Michael Snoyman <michael at snoyman.com>
Date:   Sun Jan 24 15:13:29 2016 +0200

    Switch to Travis caching


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

0fe32ff1fa74a63086363ce111b99373d687432f
 .travis.yml | 54 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 911a546..96bd7d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,47 @@
-env:
- - GHCVER=7.2.1 CABALVER=1.16
- - GHCVER=7.2.2 CABALVER=1.16
- - GHCVER=7.4.2 CABALVER=1.16
- # 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.6.3 CABALVER=1.16
- - GHCVER=7.8.4 CABALVER=1.18
- - GHCVER=7.10.1 CABALVER=1.22
- - GHCVER=7.10.2 CABALVER=1.22
- - GHCVER=head  CABALVER=head
+language: c
+sudo: false
+
+cache:
+  directories:
+  - $HOME/.ghc
+  - $HOME/.cabal
 
 matrix:
+  include:
+  - env: GHCVER=7.2.1 CABALVER=1.16
+    compiler: ": #GHC 7.2.1"
+    addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.1], sources: [hvr-ghc]}}
+  - env: GHCVER=7.2.2 CABALVER=1.16
+    compiler: ": #GHC 7.2.2"
+    addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.2], sources: [hvr-ghc]}}
+  - env: GHCVER=7.4.2 CABALVER=1.16
+    compiler: ": #GHC 7.4.2"
+    addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
+  # 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.6.3 CABALVER=1.16
+    compiler: ": #GHC 7.6.3"
+    addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
+  - env: GHCVER=7.8.4 CABALVER=1.18
+    compiler: ": #GHC 7.8.4"
+    addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
+  - env: GHCVER=7.10.1 CABALVER=1.22
+    compiler: ": #GHC 7.10.1"
+    addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1], sources: [hvr-ghc]}}
+  - env: GHCVER=7.10.2 CABALVER=1.22
+    compiler: ": #GHC 7.10.2"
+    addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
+  - env: GHCVER=7.10.3 CABALVER=1.22
+    compiler: ": #GHC 7.10.3"
+    addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
+
+  - env: GHCVER=head  CABALVER=head
+    addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
+
   allow_failures:
-   - env: GHCVER=head  CABALVER=head
+  - env: GHCVER=head  CABALVER=head
 
 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