From 9a40bc03ee8f32f360dcc0b12a6772dfa3cf369b Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 11 Apr 2015 18:01:03 -0400 Subject: [PATCH] fix logging to hastebin --- libretro-buildbot-recipe.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index b3b61862..7d32a74e 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -209,7 +209,7 @@ build_libretro_generic_makefile() { echo "compiling..." if [ -z "${ARGS}" ]; then echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}" - ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} &> /tmp/buildbot.log else if [ "${NAME}" = "mame2010" ]; then @@ -217,7 +217,7 @@ build_libretro_generic_makefile() { ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools fi echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" - ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} | tee /tmp/current.log + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} &> /tmp/buildbot.log fi if [ $? -eq 0 ]; then @@ -228,10 +228,12 @@ build_libretro_generic_makefile() { fi cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else - ERROR=`cat /tmp/current.log | tail -n 1000` - HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR"` + ERROR=`cat /tmp/buildbot.log | tail -n 1000` + HASTE=`curl -XPOST http://hastebin.com/documents -d"$ERROR" | cut --fields=4 --delimiter='"'` MESSAGE="$1 build failed [$jobid] [LOG: $HASTE]" + + fi echo BUILDBOT JOB: $MESSAGE buildbot_log "$MESSAGE"