Commit fe857d07 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Use Cabal build scripts on CI

parent 48e8b6f2
...@@ -18,10 +18,10 @@ matrix: ...@@ -18,10 +18,10 @@ matrix:
script: script:
# Run internal Hadrian tests # Run internal Hadrian tests
- ./build.sh selftest - ./build.cabal.sh selftest
# Build GHC # 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 # Test GHC binary
- cd .. - cd ..
...@@ -44,10 +44,10 @@ matrix: ...@@ -44,10 +44,10 @@ matrix:
script: script:
# Run internal Hadrian tests # Run internal Hadrian tests
- ./build.sh selftest - ./build.cabal.sh selftest
# Build GHC # 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 # Test GHC binary
- cd .. - cd ..
...@@ -63,7 +63,7 @@ matrix: ...@@ -63,7 +63,7 @@ matrix:
script: script:
# Due to timeout limit of OS X build on Travis CI, # Due to timeout limit of OS X build on Travis CI,
# we will ignore selftest and build only stage1 # 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: install:
# Add Cabal to PATH # Add Cabal to PATH
......
...@@ -30,10 +30,10 @@ compile: ...@@ -30,10 +30,10 @@ compile:
# XXX: export PATH doesn't work well either, so we use inline env # XXX: export PATH doesn't work well either, so we use inline env
# Self test # 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 # 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: test:
override: override:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment