From 0f107ce404aef1f239b78f42ef3f0a5989cc05c9 Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 3 Dec 2017 13:05:16 -0800 Subject: [PATCH] libretro-buildbot-recipe.sh: Don't remove branches if travis is running the script. --- libretro-buildbot-recipe.sh | 2 +- travis/build-long.sh | 1 + travis/build.sh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index dbd400b7..2af8de08 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -752,7 +752,7 @@ while read line; do CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" - if [ "${GIT_BRANCH}" != "${CURRENT_BRANCH}" ]; then + if [ "${GIT_BRANCH}" != "${CURRENT_BRANCH}" ] && [ "${TRAVIS:-0}" = "0" ]; then echo "Changing to the branch ${GIT_BRANCH} from ${CURRENT_BRANCH}" git remote set-branches origin "${GIT_BRANCH}" git fetch --depth 1 origin "${GIT_BRANCH}" diff --git a/travis/build-long.sh b/travis/build-long.sh index eb548a1c..36d26f9a 100755 --- a/travis/build-long.sh +++ b/travis/build-long.sh @@ -4,6 +4,7 @@ export LOGDATE=`date +%Y-%m-%d` mkdir -p /tmp/log/${LOGDATE} export BOT=. export TMPDIR=/tmp +export TRAVIS=1 export EXIT_ON_ERROR=1 # taken from https://stackoverflow.com/questions/26082444/how-to-work-around-travis-cis-4mb-output-limit diff --git a/travis/build.sh b/travis/build.sh index 8a76b27d..58fc6d53 100755 --- a/travis/build.sh +++ b/travis/build.sh @@ -4,6 +4,7 @@ export LOGDATE=`date +%Y-%m-%d` mkdir -p /tmp/log/${LOGDATE} export BOT=. export TMPDIR=/tmp +export TRAVIS=1 export EXIT_ON_ERROR=1 ./build-${PLATFORM}.sh