From 2d0bb01b1eb235785051a8f39e84837eed3ee837 Mon Sep 17 00:00:00 2001 From: radius Date: Fri, 14 Oct 2016 19:27:47 -0500 Subject: [PATCH] rename staging build --- libretro-buildbot-recipe.sh | 8 ++++---- recipes/android/retroarch-android-dev | 1 - recipes/android/retroarch-android-dev.conf | 12 ------------ recipes/android/retroarch-android-dev.ra | 7 ------- 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 recipes/android/retroarch-android-dev delete mode 100644 recipes/android/retroarch-android-dev.conf delete mode 100644 recipes/android/retroarch-android-dev.ra diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 74ad31bd..f93ad20a 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1304,8 +1304,8 @@ EOF cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk else - cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-dev-release.apk | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log - cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-dev-release.apk + cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-staging-release.apk | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log + cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-staging-release.apk fi @@ -1335,8 +1335,8 @@ EOF cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-debug.apk | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-debug.apk else - cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-dev-debug.apk | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log - cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-dev-debug.apk + cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-staging-debug.apk | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log + cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-staging-debug.apk fi if [ $? -eq 0 ]; then diff --git a/recipes/android/retroarch-android-dev b/recipes/android/retroarch-android-dev deleted file mode 100644 index 8b137891..00000000 --- a/recipes/android/retroarch-android-dev +++ /dev/null @@ -1 +0,0 @@ - diff --git a/recipes/android/retroarch-android-dev.conf b/recipes/android/retroarch-android-dev.conf deleted file mode 100644 index 32021c45..00000000 --- a/recipes/android/retroarch-android-dev.conf +++ /dev/null @@ -1,12 +0,0 @@ -ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux -NDK_ROOT /home/buildbot/tools/android/android-ndk-r10e -ANDROID_NDK /home/buildbot/tools/android/android-ndk-r10e -PATH /home/buildbot/tools/android/android-ndk-r10e:/home/buildbot/tools/android/android-sdk-linux/tools -PLATFORM android -platform android -MAKE make -NDK ndk-build -RA YES -LIBSUFFIX _android -JAVA_HOME /usr/lib/jvm/java-7-oracle -BRANCH staging diff --git a/recipes/android/retroarch-android-dev.ra b/recipes/android/retroarch-android-dev.ra deleted file mode 100644 index eb868dd0..00000000 --- a/recipes/android/retroarch-android-dev.ra +++ /dev/null @@ -1,7 +0,0 @@ -retroarch retroarch-dev https://github.com/libretro/Retroarch.git SUBMODULE YES . -overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch-dev/media -shaders shaders_cg https://github.com/libretro/common-shaders.git ASSETS YES retroarch-dev/media -autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch-dev/media -assets assets https://github.com/libretro/retroarch-assets.git ASSETS YES retroarch-dev/media -libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch-dev/media -