From cba2bd3c545ac40ec263f054f0976eb1b29cbae5 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Tue, 4 Sep 2018 12:47:30 -0400 Subject: [PATCH] travis: use NOCLEAN to let PRs build properly --- travis/build-3ds.sh | 4 ++-- travis/build-linux_x64.sh | 4 ++-- travis/build-ngc.sh | 4 ++-- travis/build-osx_x64.sh | 4 ++-- travis/build-retroarch-metal.sh | 3 ++- travis/build-wii.sh | 4 ++-- travis/build-wiiu.sh | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/travis/build-3ds.sh b/travis/build-3ds.sh index 566f61d8..9542d11b 100755 --- a/travis/build-3ds.sh +++ b/travis/build-3ds.sh @@ -22,5 +22,5 @@ fi [ -z "${NAME:-}" ] && NAME="${CORE}" -# only build the one core specified in $CORE -FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" +# only build the one core specified in $CORE, use NOCLEAN so we don't reset the repo back to master/HEAD in case this is a PR +NOCLEAN=1 FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" diff --git a/travis/build-linux_x64.sh b/travis/build-linux_x64.sh index c101afba..7f0681c9 100755 --- a/travis/build-linux_x64.sh +++ b/travis/build-linux_x64.sh @@ -12,5 +12,5 @@ fi [ -z "${NAME:-}" ] && NAME="${CORE}" -# only build the one core specified in $CORE -FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" +# only build the one core specified in $CORE, use NOCLEAN so we don't reset the repo back to master/HEAD in case this is a PR +NOCLEAN=1 FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" diff --git a/travis/build-ngc.sh b/travis/build-ngc.sh index 8d98ce29..f0ec33ec 100755 --- a/travis/build-ngc.sh +++ b/travis/build-ngc.sh @@ -23,5 +23,5 @@ fi [ -z "${NAME:-}" ] && NAME="${CORE}" -# only build the one core specified in $CORE -FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" +# only build the one core specified in $CORE, use NOCLEAN so we don't reset the repo back to master/HEAD in case this is a PR +NOCLEAN=1 FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" diff --git a/travis/build-osx_x64.sh b/travis/build-osx_x64.sh index 2067b66d..1e3352e4 100755 --- a/travis/build-osx_x64.sh +++ b/travis/build-osx_x64.sh @@ -12,5 +12,5 @@ fi [ -z "${NAME:-}" ] && NAME="${CORE}" -# only build the one core specified in $CORE -FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" +# only build the one core specified in $CORE, use NOCLEAN so we don't reset the repo back to master/HEAD in case this is a PR +NOCLEAN=1 FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" diff --git a/travis/build-retroarch-metal.sh b/travis/build-retroarch-metal.sh index 12f67512..32e99531 100755 --- a/travis/build-retroarch-metal.sh +++ b/travis/build-retroarch-metal.sh @@ -15,4 +15,5 @@ rm -fr retroarch mv ${TRAVIS_BUILD_DIR} retroarch ln -s `pwd`/retroarch ${TRAVIS_BUILD_DIR} -FORCE=YES SINGLE_CORE=retroarch METAL=1 ./libretro-buildbot-recipe.sh "${RECIPE}" +# only build the one core specified in $SINGLE_CORE, use NOCLEAN so we don't reset the repo back to master/HEAD in case this is a PR +NOCLEAN=1 FORCE=YES SINGLE_CORE=retroarch METAL=1 ./libretro-buildbot-recipe.sh "${RECIPE}" diff --git a/travis/build-wii.sh b/travis/build-wii.sh index 8fe3edd6..b697f3c0 100755 --- a/travis/build-wii.sh +++ b/travis/build-wii.sh @@ -23,5 +23,5 @@ fi [ -z "${NAME:-}" ] && NAME="${CORE}" -# only build the one core specified in $CORE -FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" +# only build the one core specified in $CORE, use NOCLEAN so we don't reset the repo back to master/HEAD in case this is a PR +NOCLEAN=1 FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" diff --git a/travis/build-wiiu.sh b/travis/build-wiiu.sh index b33d1d00..8ff2384e 100755 --- a/travis/build-wiiu.sh +++ b/travis/build-wiiu.sh @@ -22,5 +22,5 @@ fi [ -z "${NAME:-}" ] && NAME="${CORE}" -# only build the one core specified in $CORE -FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}" +# only build the one core specified in $CORE, use NOCLEAN so we don't reset the repo back to master/HEAD in case this is a PR +NOCLEAN=1 FORCE=YES SINGLE_CORE="${CORE}" CORE="${NAME}" ./libretro-buildbot-recipe.sh "${RECIPE}"