[commit: ghc] wip/nfs-locking: Make OS X build faster and Add GHC 8.0.2 build on Travis CI (#370) (b7fff3b)

[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/b7fff3b6749a01a2ad486bff68e6e0fdeab338e4/ghc

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

commit b7fff3b6749a01a2ad486bff68e6e0fdeab338e4
Author: Zhen Zhang <izgzhen at gmail.com>
Date:   Wed Jul 19 22:44:42 2017 +0800

    Make OS X build faster and Add GHC 8.0.2 build on Travis CI (#370)


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

b7fff3b6749a01a2ad486bff68e6e0fdeab338e4
 .travis.yml | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd6af26..d85291a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,36 @@
 sudo: true
-
+language: haskell
 matrix:
     include:
         - os: linux
           env: MODE="--flavour=quickest"
+          compiler: "GHC 8.0.2"
+          addons:
+              apt:
+                  packages:
+                      - ghc-8.0.2
+                      - cabal-install-2.0
+                      - zlib1g-dev
+                  sources: hvr-ghc
+
+          before_install:
+              - PATH="/opt/ghc/8.0.2/bin:$PATH"
+              - PATH="/opt/cabal/2.0/bin:$PATH"
+
+          script:
+              # Run internal Hadrian tests
+              - ./build.sh selftest
+
+              # Build GHC
+              - ./build.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=-
+
+              # Test GHC binary
+              - cd ..
+              - inplace/bin/ghc-stage2 -e 1+2
+
+        - os: linux
+          env: MODE="--flavour=quickest"
+          compiler: "GHC 7.10.3"
           addons:
               apt:
                   packages:
@@ -11,17 +38,33 @@ matrix:
                       - cabal-install-1.22
                       - zlib1g-dev
                   sources: hvr-ghc
+
           before_install:
               - PATH="/opt/ghc/7.10.3/bin:$PATH"
               - PATH="/opt/cabal/1.22/bin:$PATH"
 
+          script:
+              # Run internal Hadrian tests
+              - ./build.sh selftest
+
+              # Build GHC
+              - ./build.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=-
+
+              # Test GHC binary
+              - cd ..
+              - inplace/bin/ghc-stage2 -e 1+2
+
         - os: osx
           osx_image: xcode8
           env: MODE="--flavour=quickest --integer-simple"
           before_install:
               - brew update
               - brew install ghc cabal-install
-              -
+
+          script:
+              # Due to timeout limit of OS X build on Travis CI,
+              # we will ignore selftest and build only stage1
+              - ./build.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=- inplace/bin/ghc-stage1
 
 install:
     # Add Cabal to PATH
@@ -50,17 +93,6 @@ install:
     - cd ghc/hadrian
     - git reset --hard HEAD
 
-script:
-    # Run internal Hadrian tests
-    - ./build.sh selftest
-
-    # Build GHC
-    - ./build.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=-
-
-    # Test GHC binary
-    - cd ..
-    - inplace/bin/ghc-stage2 -e 1+2
-
 cache:
     directories:
         - $HOME/.cabal