ShuriZma
/
libretro-super
mirror of https://github.com/libretro/libretro-super.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libretro-buildbot-recipe.sh: Check if the HEAD commit is new or not. 

Newer git versions now report 'Already up to date.' instead of 'Already up-to-date' so we need a more robust solution.
This commit is contained in:
orbea 2017-11-29 17:45:17 -08:00
parent 2f56bbc8c7
commit e3a38f76e1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretro-buildbot-recipe.sh
View File

@ -812,10 +812,10 @@ while read line; do
fi fi
echo "pulling changes from repo $URL..." echo "pulling changes from repo $URL..."
OUT="$(git pull)" HEAD="$(git rev-parse HEAD)"
echo "$OUT" git pull
if [[ $OUT == *"Already up-to-date"* ]] && [ "${BUILD}" != "YES" ]; then if [ "$HEAD" = "$(git rev-parse HEAD)" ] && [ "${BUILD}" != "YES" ]; then
BUILD="NO" BUILD="NO"
else else
echo "resetting repo state $URL..." echo "resetting repo state $URL..."
@ -944,12 +944,12 @@ buildbot_pull(){
fi fi
echo "pulling changes from repo $URL... " echo "pulling changes from repo $URL... "
OUT=`git pull` HEAD="$(git rev-parse HEAD)"
echo $OUT git pull
if [ "${TYPE}" = "PROJECT" ]; then if [ "${TYPE}" = "PROJECT" ]; then
RADIR=$DIR RADIR=$DIR
if [[ $OUT == *"Already up-to-date"* ]] && [ ! "${BUILD}" = "YES" ]; then if [ "$HEAD" = "$(git rev-parse HEAD)" ] && [ "${BUILD}" != "YES" ]; then
BUILD="NO" BUILD="NO"
else else
echo "resetting repo state $URL... " echo "resetting repo state $URL... "