From b2762b91515d0aa386f035dbdd5691fc60e3b276 Mon Sep 17 00:00:00 2001 From: Brad Parker Date: Tue, 31 Oct 2017 18:09:39 -0400 Subject: [PATCH] travis: move build dir to where libretro-super would clone the repo, fixes building of PRs instead of upstream master --- travis/build-3ds.sh | 5 +++++ travis/build-linux_x64.sh | 5 +++++ travis/build-ngc.sh | 5 +++++ travis/build-osx_x64.sh | 5 +++++ travis/build-wii.sh | 5 +++++ travis/build-wiiu.sh | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/travis/build-3ds.sh b/travis/build-3ds.sh index e16c5ae1..5bd2f2cd 100755 --- a/travis/build-3ds.sh +++ b/travis/build-3ds.sh @@ -14,5 +14,10 @@ tar Jkxf 3ds.tar.xz cd ~/libretro-super +if [ "${TRAVIS_BUILD_DIR}" ]; then + CORE_DIRNAME=`grep ${CORE} ${RECIPE} | head -1 | awk '{print $2}'` + mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME} +fi + # only build the one core specified in $CORE SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE} diff --git a/travis/build-linux_x64.sh b/travis/build-linux_x64.sh index e2b128bc..f21a36aa 100755 --- a/travis/build-linux_x64.sh +++ b/travis/build-linux_x64.sh @@ -4,5 +4,10 @@ RECIPE=recipes/linux/cores-linux-x64-generic cd ~/libretro-super +if [ "${TRAVIS_BUILD_DIR}" ]; then + CORE_DIRNAME=`grep ${CORE} ${RECIPE} | head -1 | awk '{print $2}'` + mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME} +fi + # only build the one core specified in $CORE SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE} diff --git a/travis/build-ngc.sh b/travis/build-ngc.sh index 9fd02c93..a13f064c 100755 --- a/travis/build-ngc.sh +++ b/travis/build-ngc.sh @@ -15,5 +15,10 @@ tar Jkxf wiiu.tar.xz cd ~/libretro-super +if [ "${TRAVIS_BUILD_DIR}" ]; then + CORE_DIRNAME=`grep ${CORE} ${RECIPE} | head -1 | awk '{print $2}'` + mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME} +fi + # only build the one core specified in $CORE SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE} diff --git a/travis/build-osx_x64.sh b/travis/build-osx_x64.sh index 3a3a847c..2b3d41d4 100755 --- a/travis/build-osx_x64.sh +++ b/travis/build-osx_x64.sh @@ -4,5 +4,10 @@ RECIPE=recipes/apple/cores-osx-x64-generic cd ~/libretro-super +if [ "${TRAVIS_BUILD_DIR}" ]; then + CORE_DIRNAME=`grep ${CORE} ${RECIPE} | head -1 | awk '{print $2}'` + mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME} +fi + # only build the one core specified in $CORE SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE} diff --git a/travis/build-wii.sh b/travis/build-wii.sh index 15914d75..75af1b77 100755 --- a/travis/build-wii.sh +++ b/travis/build-wii.sh @@ -15,5 +15,10 @@ tar Jkxf wiiu.tar.xz cd ~/libretro-super +if [ "${TRAVIS_BUILD_DIR}" ]; then + CORE_DIRNAME=`grep ${CORE} ${RECIPE} | head -1 | awk '{print $2}'` + mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME} +fi + # only build the one core specified in $CORE SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE} diff --git a/travis/build-wiiu.sh b/travis/build-wiiu.sh index 73791d1c..257960f6 100755 --- a/travis/build-wiiu.sh +++ b/travis/build-wiiu.sh @@ -14,5 +14,10 @@ tar Jkxf wiiu.tar.xz cd ~/libretro-super +if [ "${TRAVIS_BUILD_DIR}" ]; then + CORE_DIRNAME=`grep ${CORE} ${RECIPE} | head -1 | awk '{print $2}'` + mv ${TRAVIS_BUILD_DIR} ${CORE_DIRNAME} +fi + # only build the one core specified in $CORE SINGLE_CORE=${CORE} ./libretro-buildbot-recipe.sh ${RECIPE}