mirror/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super synced 2025-02-04 15:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #657 from orbea/update

Browse Source 
libretro-buildbot-recipe.sh: Don't rely on the UPDATE variable.
This commit is contained in:
Andrés 2017-12-22 17:19:39 -05:00 committed by GitHub
commit 0a1ec6d60a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libretro-buildbot-recipe.sh
View File

@ -594,20 +594,34 @@ while read line; do
echo
BUILD="NO"
UPDATE="YES"
BUILD_ORIG=$BUILD
FORCE_ORIG=$FORCE
if [ ! -d "${DIR}/.git" ] || [ "${CLEANUP}" = "YES" ]; then
rm -rfv -- "$DIR"
echo "cloning repo $URL..."
git clone --depth=1 -b "$GIT_BRANCH" "$URL" "$DIR"
BUILD="YES"
UPDATE="NO"
else
if [ -f "$DIR/.forcebuild" ]; then
echo "found $DIR/.forcebuild file, building $NAME"
BUILD="YES"
fi
HEAD="$(git --work-tree="$DIR" --git-dir="$DIR/.git" rev-parse HEAD)" || \
{ echo 'git directory broken, removing $NAME and skipping.'; \
{ echo "git directory broken, removing $DIR and skipping $NAME."; \
rm -rfv -- "$DIR" && continue; }
echo "pulling changes from repo $URL..."
git --work-tree="$DIR" --git-dir="$DIR/.git" pull
if [ "$HEAD" = "$(git --work-tree="$DIR" --git-dir="$DIR/.git" rev-parse HEAD)" ] && [ "${BUILD}" != "YES" ]; then
BUILD="NO"
else
echo "resetting repo state $URL..."
git --work-tree="$DIR" --git-dir="$DIR/.git" reset --hard FETCH_HEAD
git --work-tree="$DIR" --git-dir="$DIR/.git" clean -xdf
BUILD="YES"
fi
fi
cd "$DIR" || { echo "Failed to cd to ${DIR}, skipping ${NAME}"; continue; }
@ -621,28 +635,8 @@ while read line; do
git checkout "${GIT_BRANCH}"
git branch -D "${CURRENT_BRANCH}"
BUILD="YES"
UPDATE="NO"
fi
if [ "${UPDATE}" != "NO" ]; then
if [ -f .forcebuild ]; then
echo "found .forcebuild file, building $NAME"
BUILD="YES"
fi
if [ "$HEAD" = "$(git rev-parse HEAD)" ] && [ "${BUILD}" != "YES" ]; then
BUILD="NO"
else
echo "resetting repo state $URL..."
git reset --hard FETCH_HEAD
git clean -xdf
BUILD="YES"
fi
fi
FORCE_ORIG=$FORCE
OLDBUILD=$BUILD
for core in 81 emux_nes emux_sms fuse gw mgba; do
if [ "${PREVCORE}" = "$core" ] && [ "${PREVBUILD}" = "YES" ] && [ "${NAME}" = "$core" ]; then
FORCE="YES"
@ -687,7 +681,7 @@ while read line; do
PREVCORE=$NAME
PREVBUILD=$BUILD
BUILD=$OLDBUILD
BUILD=$BUILD_ORIG
FORCE=$FORCE_ORIG
done < $RECIPE