diff --git a/.travis.yml b/.travis.yml index 592273d1f..a2a276db4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ sudo: false language: c git: submodules: false -script: bash -ex tools/ci/travis/travis-ci.sh +script: bash -e tools/ci/travis/travis-ci.sh matrix: include: - env: CI_KIND=build XARCH=i386 diff --git a/tools/ci/travis/travis-ci.sh b/tools/ci/travis/travis-ci.sh index efcf71698..eb10bcb2c 100755 --- a/tools/ci/travis/travis-ci.sh +++ b/tools/ci/travis/travis-ci.sh @@ -14,10 +14,6 @@ #* * #************************************************************************** -PREFIX=~/local - -MAKE=make SHELL=dash - # TRAVIS_COMMIT_RANGE has the form ... # TRAVIS_CUR_HEAD is # TRAVIS_PR_HEAD is @@ -33,6 +29,14 @@ MAKE=make SHELL=dash # TRAVIS_MERGE_BASE # echo TRAVIS_COMMIT_RANGE=$TRAVIS_COMMIT_RANGE +echo TRAVIS_COMMIT=$TRAVIS_COMMIT + +set -x + +PREFIX=~/local + +MAKE=make SHELL=dash + TRAVIS_CUR_HEAD=${TRAVIS_COMMIT_RANGE%%...*} TRAVIS_PR_HEAD=${TRAVIS_COMMIT_RANGE##*...} case $TRAVIS_EVENT_TYPE in