Merge pull request #405 from hizzlekizzle/master

more hastebin replacement changes
This commit is contained in:
Twinaphex 2016-12-31 22:02:39 +01:00 committed by GitHub
commit 33ac3edeed

View File

@ -311,7 +311,7 @@ build_libretro_generic_makefile() {
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1: [status: fail] [$jobid] LOG: http://hastebin.com/$HASTE"
MESSAGE="$1: [status: fail] [$jobid] LOG: $HASTE"
fi
echo buildbot job: $MESSAGE
@ -363,7 +363,7 @@ build_libretro_leiradel_makefile() {
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1: [status: fail] [$jobid] LOG: http://hastebin.com/$HASTE"
MESSAGE="$1: [status: fail] [$jobid] LOG: $HASTE"
fi
echo buildbot job: $MESSAGE
@ -419,7 +419,7 @@ build_libretro_generic_gl_makefile() {
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1: [status: fail] [$jobid] LOG: http://hastebin.com/$HASTE"
MESSAGE="$1: [status: fail] [$jobid] LOG: $HASTE"
fi
echo buildbot job: $MESSAGE
buildbot_log "$MESSAGE"
@ -478,7 +478,7 @@ build_libretro_generic_jni() {
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}_${a}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1-$a: [status: fail] [$jobid] LOG: http://hastebin.com/$HASTE"
MESSAGE="$1-$a: [status: fail] [$jobid] LOG: $HASTE"
echo buildbot job: $MESSAGE
buildbot_log "$MESSAGE"
fi
@ -536,7 +536,7 @@ build_libretro_bsnes_jni() {
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLATFORM}_${a}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1-$a-${PROFILE}: [status: fail] [$jobid] LOG: http://hastebin.com/$HASTE"
MESSAGE="$1-$a-${PROFILE}: [status: fail] [$jobid] LOG: $HASTE"
fi
echo buildbot job: $MESSAGE
@ -600,7 +600,7 @@ build_libretro_bsnes() {
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="$1-${PROFILE}: [status: fail] [$jobid] LOG: http://hastebin.com/$HASTE"
MESSAGE="$1-${PROFILE}: [status: fail] [$jobid] LOG: $HASTE"
fi
echo buildbot job: $MESSAGE
@ -1111,7 +1111,7 @@ if [ "${PLATFORM}" == "osx" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
@ -1128,7 +1128,7 @@ if [ "${PLATFORM}" == "osx" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_CG_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
@ -1166,7 +1166,7 @@ if [ "${PLATFORM}" == "ios" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
@ -1210,7 +1210,7 @@ if [ "${PLATFORM}" == "ios9" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
@ -1342,7 +1342,7 @@ EOF
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
echo buildbot job: $MESSAGE
@ -1437,13 +1437,9 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO
buildbot_log "$MESSAGE"
${HELPER} ${MAKE} clean
<<<<<<< HEAD
${HELPER} ${MAKE} -j${JOBS} DEBUG=1 GL_DEBUG=1 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.txt
for i in $(seq 3); do for bin in $(ntldd -R *exe | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -vu "$bin" . ; done; done
=======
${HELPER} ${MAKE} -j${JOBS} DEBUG=1 GL_DEBUG=1 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log
>>>>>>> parent of 79dd1f7... skip hastebinning and point to local log instead
for i in $(seq 3); do for bin in $(ntldd *exe *dll | grep -i mingw | cut -d\ -f 3); do cp -vu "$bin" . ; done; for bin in $(ldd *exe *dll | grep -i mingw | cut -d\ -f 3); do cp -vu "$bin" . ; done; done;
cp -v retroarch.exe windows/retroarch_debug.exe | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
cp -v *.dll windows/
@ -1491,7 +1487,7 @@ EOF
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
echo buildbot job: $MESSAGE | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
buildbot_log "$MESSAGE"
@ -1527,7 +1523,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1572,7 +1568,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1620,7 +1616,7 @@ if [ "${PLATFORM}" == "wiiu" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1659,7 +1655,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1704,7 +1700,7 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1767,7 +1763,7 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1811,7 +1807,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_dex.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1824,7 +1820,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_cex.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1837,7 +1833,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_ode.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1874,7 +1870,7 @@ if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
fi
buildbot_log "$MESSAGE"
@ -1970,7 +1966,7 @@ if [ "${PLATFORM}" = "unix" ]; then
ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
HASTE=`curl -X POST http://p.0bl.net/ --data-binary @$ERROR`
//HASTE=`echo $HASTE | cut -d"\"" -f4`
MESSAGE="retroarch: [status: fail] [$jobid] LOG: http://p.0bl.net/$HASTE"
MESSAGE="retroarch: [status: fail] [$jobid] LOG: $HASTE"
echo $MESSAGE
echo buildbot job: $MESSAGE | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
buildbot_log "$MESSAGE"