Use Cabal build scripts on CI
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Sat, 5 Aug 2017 10:34:34 +0000 (11:34 +0100)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Sat, 5 Aug 2017 10:34:34 +0000 (11:34 +0100)
.travis.yml
circle.yml

index 49fac80..c23e92a 100644 (file)
@@ -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
index 457add7..606664a 100644 (file)
@@ -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: