[commit: ghc] wip/nfs-locking: Can we put addons and before_install into the include? (a5aa58f)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/a5aa58f81ceab822e035cb17f25bc05dec8dc092/ghc

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

commit a5aa58f81ceab822e035cb17f25bc05dec8dc092
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Jan 6 13:03:06 2016 +0800

    Can we put addons and before_install into the include?


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

a5aa58f81ceab822e035cb17f25bc05dec8dc092
 .travis.yml | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b21b89e..5c5708c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,28 +4,30 @@ matrix:
     include:
         - os: linux
           env: CABALVER=1.22 GHCVER=7.10.3
+          addons:
+              apt:
+                  packages:
+                      - ghc-7.10.3
+                      - alex-3.1.4
+                      - happy-1.19.5
+                      - cabal-install-1.22
+                      - zlib1g-dev
+                  sources: hvr-ghc
+          before_install:
+              - PATH="/opt/ghc/$GHCVER/bin:$PATH"
+              - PATH="/opt/cabal/$CABALVER/bin:$PATH"
+              - PATH="$HOME/.cabal/bin:$PATH"
+              - export PATH
         - os: osx
-
-addons:
-    apt:
-        packages:
-            - ghc-7.10.3
-            - alex-3.1.4
-            - happy-1.19.5
-            - cabal-install-1.22
-            - zlib1g-dev
-        sources: hvr-ghc
+          before_install:
+              - brew update
+              - brew install ghc cabal-install
+              - cabal update
+              - cabal install alex happy
+              - PATH="$HOME/.cabal/bin:$PATH"
+              - export PATH
 
 before_install:
-    - if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi
-    - if [ $TRAVIS_OS_NAME == osx ]; then brew install ghc cabal-install; fi
-    - if [ $TRAVIS_OS_NAME == osx ]; then cabal update; fi
-    - if [ $TRAVIS_OS_NAME == osx ]; then cabal install alex happy; fi
-    - if [ $TRAVIS_OS_NAME == linux ]; then PATH="/opt/ghc/$GHCVER/bin:$PATH"; fi
-    - if [ $TRAVIS_OS_NAME == linux ]; then PATH="/opt/cabal/$CABALVER/bin:$PATH"; fi
-    - PATH="$HOME/.cabal/bin:$PATH"
-    - export PATH
-
     - env
     - ghc --version
     - cabal --version