1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-12-26 23:36:08 +03:00

Fetch before merging for committing the release appcast into develop

This commit is contained in:
Tae Won Ha 2017-08-12 09:21:01 +02:00
parent b1c81d8ee1
commit 6d82eb982c
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44

View File

@ -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