Merge pull request #622 from orbea/git

libretro-buildbot-recipe.sh: Check if the HEAD commit is new or not.
This commit is contained in:
Twinaphex 2017-11-30 08:59:15 +01:00 committed by GitHub
commit d68aabe580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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