From 659c4cc18838aa7f18176a9ff759170981c58126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s?= Date: Wed, 28 Dec 2016 11:17:26 -0500 Subject: [PATCH 1/2] Maybe this will fix the problem with empty zip files every now and then --- libretro-buildbot-recipe.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 718044c0..ed084c29 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1090,7 +1090,6 @@ if [ "${PLATFORM}" == "osx" ] && [ "${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 git clean -xdf echo WORKINGDIR=$PWD @@ -1123,6 +1122,7 @@ if [ "${PLATFORM}" == "osx" ] && [ "${RA}" == "YES" ]; then if [ $? -eq 0 ]; then MESSAGE="retroarch: [status: done] [$jobid]" + touch $TMPDIR/built-frontend echo $MESSAGE else ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_CG_${PLATFORM}.txt @@ -1150,7 +1150,6 @@ if [ "${PLATFORM}" == "ios" ] && [ "${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 git clean -xdf echo "buildbot job: $jobid Building" @@ -1161,6 +1160,7 @@ if [ "${PLATFORM}" == "ios" ] && [ "${RA}" == "YES" ]; then if [ $? -eq 0 ]; then MESSAGE="retroarch: [status: done] [$jobid]" + touch $TMPDIR/built-frontend echo $MESSAGE else ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.txt @@ -1190,7 +1190,6 @@ if [ "${PLATFORM}" == "ios9" ] && [ "${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 git clean -xdf echo "buildbot job: $jobid Building" @@ -1201,6 +1200,7 @@ if [ "${PLATFORM}" == "ios9" ] && [ "${RA}" == "YES" ]; then if [ $? -eq 0 ]; then MESSAGE="retroarch: [status: done] [$jobid]" + touch $TMPDIR/built-frontend cd build/Release-iphoneos security unlock-keychain -p buildbot /Users/buildbot/Library/Keychains/login.keychain codesign -fs "buildbot" RetroArch.app @@ -1235,7 +1235,6 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then buildbot_pull if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then - touch $TMPDIR/built-frontend echo "buildbot job: $jobid compiling shaders" echo cd $RADIR @@ -1337,6 +1336,7 @@ EOF if [ $? -eq 0 ]; then MESSAGE="retroarch: [status: done] [$jobid]" + touch $TMPDIR/built-frontend echo $MESSAGE else ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.txt @@ -1446,6 +1446,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO if [ $? -eq 0 ]; then MESSAGE="retroarch debug: [status: done] [$jobid]" + touch $TMPDIR/built-frontend echo $MESSAGE echo buildbot job: $MESSAGE | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.txt buildbot_log "$MESSAGE" @@ -1502,7 +1503,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${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 git clean -xdf echo "buildbot job: $jobid Building" From 102a475d81b4d1a33397b521cb5e634faf386940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s?= Date: Wed, 28 Dec 2016 11:20:06 -0500 Subject: [PATCH 2/2] this one too --- libretro-buildbot-recipe.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index ed084c29..846e508a 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1362,7 +1362,6 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO echo if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then - touch $TMPDIR/built-frontend cd $RADIR git clean -xdf echo "buildbot job: $jobid Building" @@ -1432,6 +1431,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO if [ $status -eq 0 ]; then MESSAGE="retroarch: [status: done] [$jobid]" + touch $TMPDIR/built-frontend echo $MESSAGE echo buildbot job: $MESSAGE | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.txt buildbot_log "$MESSAGE" @@ -1446,7 +1446,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO if [ $? -eq 0 ]; then MESSAGE="retroarch debug: [status: done] [$jobid]" - touch $TMPDIR/built-frontend + echo $MESSAGE echo buildbot job: $MESSAGE | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.txt buildbot_log "$MESSAGE" @@ -1516,6 +1516,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then time sh ./dist-cores.sh psp1 &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.txt if [ $? -eq 0 ]; then MESSAGE="retroarch: [status: done] [$jobid]" + touch $TMPDIR/built-frontend echo $MESSAGE else ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.txt