From 4ae32b042bea5b220b806bd30becd3816747e8f3 Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 12 Jan 2017 17:35:02 -0500 Subject: [PATCH 1/2] try to fix this again --- libretro-buildbot-recipe.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 6f956885..172ab561 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1117,7 +1117,7 @@ if [ "${PLATFORM}" == "osx" ] && [ "${RA}" == "YES" ]; then buildbot_pull if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo WORKINGDIR=$PWD echo RELEASE=$RELEASE @@ -1175,7 +1175,7 @@ if [ "${PLATFORM}" == "ios" ] && [ "${RA}" == "YES" ]; then buildbot_pull if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1214,7 +1214,7 @@ if [ "${PLATFORM}" == "ios9" ] && [ "${RA}" == "YES" ]; then buildbot_pull if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1260,7 +1260,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then echo "buildbot job: $jobid compiling shaders" echo - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo WORKINGDIR=$PWD echo RELEASE=$RELEASE @@ -1384,15 +1384,15 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO echo if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo compile_audio_filters ${HELPER} ${MAKE} - cd $RADIR + cd $PWD/$RADIR compile_video_filters ${HELPER} ${MAKE} - cd $RADIR + cd $PWD/$RADIR echo "configuring..." echo "configure command: $CONFIGURE $ARGS" @@ -1505,7 +1505,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1549,7 +1549,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then buildbot_pull if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then touch $TMPDIR/built-frontend - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1594,7 +1594,7 @@ if [ "${PLATFORM}" == "wiiu" ] && [ "${RA}" == "YES" ]; then buildbot_pull if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then touch $TMPDIR/built-frontend - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1634,7 +1634,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then buildbot_pull if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then touch $TMPDIR/built-frontend - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1678,7 +1678,7 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then echo RADIR=$RADIR if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1740,7 +1740,7 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then touch $TMPDIR/built-frontend - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1784,7 +1784,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then touch $TMPDIR/built-frontend - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1843,7 +1843,7 @@ if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then touch $TMPDIR/built-frontend - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo @@ -1885,15 +1885,15 @@ if [ "${PLATFORM}" = "unix" ]; then if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then touch $TMPDIR/built-frontend - cd $RADIR + cd $PWD/$RADIR git clean -xdf echo "buildbot job: $jobid Building" echo compile_audio_filters ${HELPER} ${MAKE} - cd $RADIR + cd $PWD/$RADIR compile_video_filters ${HELPER} ${MAKE} - cd $RADIR + cd $PWD/$RADIR echo "configuring..." echo "configure command: $CONFIGURE $ARGS" From cc7ba028f3195ee497f925f5b499ace077e0d394 Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 12 Jan 2017 17:36:40 -0500 Subject: [PATCH 2/2] try to fix this again --- libretro-buildbot-recipe.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 172ab561..8c0a2f07 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1079,8 +1079,6 @@ compile_audio_filters() else echo buildbot job: $jobid audio filter: [status: fail]! fi - cd .. - cd .. } compile_video_filters() @@ -1096,8 +1094,6 @@ compile_video_filters() else echo buildbot job: $jobid video filter: [status: fail]! fi - cd .. - cd .. }