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:
parent
b1c81d8ee1
commit
6d82eb982c
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user