[commit: ghc] wip/nfs-locking: before_install steps don't merge (12c433c)

[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/12c433c197e3e1db24d535aae5c7d07a6dc50e8a/ghc

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

commit 12c433c197e3e1db24d535aae5c7d07a6dc50e8a
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Jan 6 13:11:19 2016 +0800

    before_install steps don't merge
    
    Moved the validation of before_install into install.


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

12c433c197e3e1db24d535aae5c7d07a6dc50e8a
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5c5708c..1bcd7fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@ matrix:
               - PATH="/opt/cabal/$CABALVER/bin:$PATH"
               - PATH="$HOME/.cabal/bin:$PATH"
               - export PATH
+              - cabal update
+
         - os: osx
           before_install:
               - brew update
@@ -27,15 +29,14 @@ matrix:
               - PATH="$HOME/.cabal/bin:$PATH"
               - export PATH
 
-before_install:
+
+install:
+
     - env
     - ghc --version
     - cabal --version
     - alex --version
     - happy --version
-    - cabal update
-
-install:
 
     - travis_retry git clone git://git.haskell.org/ghc --recurse-submodules