From 743bfbc1f2eb1741c56f927dddf2d5a37200345e Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Wed, 6 Dec 2017 21:05:10 -0800 Subject: [PATCH] build,travis: don't use TRAVIS_PULL_REQUEST TRAVIS_PULL_REQUEST can be: - undefined (local usage) - false (branch build) - PR number (if in a PR) it's never set to true use TRAVIS_PULL_REQUEST_SHA instead, so we can use normal tests (-z/-n) Signed-off-by: Etienne Champetier --- .travis_do.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis_do.sh b/.travis_do.sh index 26597f6ff..e66e23fba 100755 --- a/.travis_do.sh +++ b/.travis_do.sh @@ -68,7 +68,7 @@ download_sdk() { # test_package call make download check for very new/modified package test_packages2() { local commit_range=$TRAVIS_COMMIT_RANGE - if [ "$TRAVIS_PULL_REQUEST" = false ]; then + if [ -z "$TRAVIS_PULL_REQUEST_SHA" ]; then echo_blue "Using only the latest commit, since we're not in a Pull Request" commit_range=HEAD~1 fi @@ -148,7 +148,7 @@ EOF test_commits() { RET=0 - if [ "$TRAVIS_PULL_REQUEST" = false ]; then + if [ -z "$TRAVIS_PULL_REQUEST_SHA" ]; then echo_blue "Skipping commits tests (not in a Pull Request)" return 0 fi @@ -196,12 +196,7 @@ echo_blue "=== Travis ENV" env echo_blue "=== Travis ENV" -if [ -z "$TRAVIS_COMMIT_RANGE" ] && [ "$TRAVIS_PULL_REQUEST" = true ] ; then - echo_red "TRAVIS_COMMIT_RANGE variable is empty in a Pull Request" - exit 1 -fi - -if [ "$TRAVIS_PULL_REQUEST" = true ]; then +if [ -n "$TRAVIS_PULL_REQUEST_SHA" ]; then while true; do # if clone depth is too small, git rev-list / diff return incorrect or empty results C="$(git rev-list ${TRAVIS_COMMIT_RANGE/.../..} | tail -n1)" 2>/dev/null