From 9c233a9be82b87797d342f58cc96a5c858b624e7 Mon Sep 17 00:00:00 2001 From: orbea Date: Wed, 15 Nov 2017 15:30:39 -0800 Subject: [PATCH] libretro-buildbot-recipe.sh: Only build RetroArch if $RA = YES --- libretro-buildbot-recipe.sh | 49 +++++++++++++------------- recipes/linux/retroarch-linux-x64.conf | 1 + 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 2eb0d90c..3b304305 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1030,31 +1030,32 @@ compile_filters() fi } -echo "buildbot job: $jobid Building Retroarch-$PLATFORM" -echo -------------------------------------------------- -echo -cd $WORK -BUILD="" - -echo WORKINGDIR=$PWD -echo RELEASE=$RELEASE -echo FORCE=$FORCE_RETROARCH_BUILD -echo RADIR=$RADIR -echo BRANCH=$BRANCH - -buildbot_pull - -if [ "${BUILD}" = "YES" ] || [ "${FORCE}" = "YES" ] || [ "${FORCE_RETROARCH_BUILD}" = "YES" ] || [ "${CORES_BUILT}" = "YES" ]; then - cd "$RADIR" - git clean -xdf - echo WORKINGDIR=$PWD - echo RADIR=$RADIR - - echo "buildbot job: $jobid Building" +if [ "${RA}" = "YES" ]; then + echo "buildbot job: $jobid Building Retroarch-$PLATFORM" + echo -------------------------------------------------- echo + BUILD="" - if [ -n "${LOGURL}" ]; then - ENTRY_ID="$(curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/)" + echo WORKINGDIR=$PWD + echo RELEASE=$RELEASE + echo FORCE=$FORCE_RETROARCH_BUILD + echo RADIR=$RADIR + echo BRANCH=$BRANCH + + buildbot_pull + + if [ "${BUILD}" = "YES" ] || [ "${FORCE}" = "YES" ] || [ "${FORCE_RETROARCH_BUILD}" = "YES" ] || [ "${CORES_BUILT}" = "YES" ]; then + cd "$RADIR" + git clean -xdf + echo WORKINGDIR=$PWD + echo RADIR=$RADIR + + echo "buildbot job: $jobid Building" + echo + + if [ -n "${LOGURL}" ]; then + ENTRY_ID="$(curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/)" + fi fi fi @@ -1637,7 +1638,7 @@ if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then fi fi -if [ "${PLATFORM}" = "unix" ]; then +if [ "${PLATFORM}" = "unix" ] && [ "${RA}" = "YES" ]; then if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" ]; then diff --git a/recipes/linux/retroarch-linux-x64.conf b/recipes/linux/retroarch-linux-x64.conf index 5c11ad64..c567c8da 100644 --- a/recipes/linux/retroarch-linux-x64.conf +++ b/recipes/linux/retroarch-linux-x64.conf @@ -5,3 +5,4 @@ CONFIGURE ./configure CORE_JOB YES MAKE make PATH /usr/lib/ccache +RA YES