[commit: ghc] wip/nfs-locking: Use Cabal build scripts on CI (fe857d0)

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

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

commit fe857d074b30bf657216acdda98067aae3577440
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Aug 5 11:34:34 2017 +0100

    Use Cabal build scripts on CI


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

fe857d074b30bf657216acdda98067aae3577440
 .travis.yml | 10 +++++-----
 circle.yml  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 49fac80..c23e92a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,10 @@ matrix:
 
           script:
               # Run internal Hadrian tests
-              - ./build.sh selftest
+              - ./build.cabal.sh selftest
 
               # Build GHC
-              - ./build.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=-
+              - ./build.cabal.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=-
 
               # Test GHC binary
               - cd ..
@@ -44,10 +44,10 @@ matrix:
 
           script:
               # Run internal Hadrian tests
-              - ./build.sh selftest
+              - ./build.cabal.sh selftest
 
               # Build GHC
-              - ./build.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=-
+              - ./build.cabal.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=-
 
               # Test GHC binary
               - cd ..
@@ -63,7 +63,7 @@ matrix:
           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
+              - ./build.cabal.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=- inplace/bin/ghc-stage1
 
 install:
     # Add Cabal to PATH
diff --git a/circle.yml b/circle.yml
index 457add7..606664a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -30,10 +30,10 @@ compile:
 
     # XXX: export PATH doesn't work well either, so we use inline env
     # Self test
-    - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.sh selftest
+    - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.cabal.sh selftest
 
     # Build GHC
-    - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=-
+    - PATH=$HOME/.cabal/bin:$PATH ghc/hadrian/build.cabal.sh -j $MODE --verbose --no-progress --progress-colour=never --progress-info=brief --profile=-
 
 test:
   override: