add branch support

This commit is contained in:
radius 2016-03-22 17:36:43 -05:00
parent 926c6a966c
commit fc14fbc350
4 changed files with 32 additions and 1 deletions

View File

@ -5,6 +5,7 @@ LOGDATE=`date +%Y-%m-%d`
ORIGPATH=$PATH
WORK=$PWD
RECIPE=$1
BRANCH=""
# ----- read variables from recipe config -----
while read line; do
@ -1003,6 +1004,9 @@ buildbot_pull(){
if [ -d "${PARENTDIR}/${DIR}/.git" ]; then
cd $PARENTDIR
cd $DIR
if [ -z "$BRANCH" ]; then
git checkout $BRANCH
fi
echo "pulling changes from repo... "
git reset --hard
OUT=`git pull`
@ -1029,6 +1033,12 @@ buildbot_pull(){
echo "cloning repo..."
cd $PARENTDIR
git clone "$URL" "$DIR" --depth=1
if [ -z "$BRANCH" ]; then
cd $PARENTDIR
cd $DIR
git checkout $BRANCH
fi
cd $WORK
if [ "${TYPE}" = "PROJECT" ]; then
BUILD="YES"
RADIR=$DIR
@ -1211,6 +1221,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
echo RELEASE=$RELEASE
echo FORCE=$FORCE_RETROARCH_BUILD
echo RADIR=$RADIR
echo BRANCH=$BRANCH
buildbot_pull
@ -1283,7 +1294,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
cp -rf $RARCH_DIR/info/* pkg/android/phoenix/assets/info/
echo "buildbot job: $jobid Building"
buildbot_log "retroarch: [status: none] [$jobid]"
buildbot_log "retroarch: [status: none] [$jobid] [branch: [branch: $BRANCH]]"
echo
cd pkg/android/phoenix
rm bin/*.apk

View File

@ -0,0 +1 @@

View File

@ -0,0 +1,12 @@
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 sandbox

View File

@ -0,0 +1,7 @@
retroarch retroarch https://github.com/libretro/Retroarch.git SUBMODULE YES .
overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media
shaders shaders_cg https://github.com/libretro/common-shaders.git ASSETS YES retroarch/media
autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch/media
assets assets https://github.com/libretro/retroarch-assets.git ASSETS YES retroarch/media
libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media