From 6d82eb982c7fdaaa5071c8b638a5ce432658a4db Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Sat, 12 Aug 2017 09:21:01 +0200 Subject: [PATCH] Fetch before merging for committing the release appcast into develop --- bin/commit_and_push_appcast.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/commit_and_push_appcast.sh b/bin/commit_and_push_appcast.sh index 2257435c..acf9ad47 100755 --- a/bin/commit_and_push_appcast.sh +++ b/bin/commit_and_push_appcast.sh @@ -13,13 +13,15 @@ else cp ./build/Release/appcast.xml . fi -echo "### Commiting and pushing appcast" +echo "### Commiting and pushing appcast to ${BRANCH}" git commit -S -am "Bump appcast to ${COMPOUND_VERSION}" git push origin HEAD:"${BRANCH}" if [ "${IS_SNAPSHOT}" = false ] && [ "${UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE}" = true ] ; then + echo "### Committing and pushing release appcast to develop" git reset --hard @ + git fetch origin git checkout -b for_appcast origin/develop git merge --ff-only for_build cp appcast.xml appcast_snapshot.xml