1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 03:25:03 +03:00

Add a update snapshot appcast flag to jenkins job

This commit is contained in:
Tae Won Ha 2017-06-28 17:21:36 +02:00
parent d00472332f
commit fbdd37981a
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
3 changed files with 4 additions and 2 deletions

View File

@ -90,7 +90,7 @@ fi
if [ "${UPDATE_APPCAST}" = true ] ; then
./bin/set_appcast.py "build/Release/${VIMR_FILE_NAME}" "${BUNDLE_VERSION}" "${MARKETING_VERSION}" "${TAG}" ${IS_SNAPSHOT}
./bin/commit_and_push_appcast.sh "${BRANCH}" "${COMPOUND_VERSION}" ${IS_SNAPSHOT}
./bin/commit_and_push_appcast.sh "${BRANCH}" "${COMPOUND_VERSION}" ${IS_SNAPSHOT} ${UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE}
fi
echo "### Built VimR"

View File

@ -5,6 +5,7 @@ set -e
BRANCH=$1
COMPOUND_VERSION=$2
IS_SNAPSHOT=$3
UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE=$4
if [ "${IS_SNAPSHOT}" = true ] ; then
cp ./build/Release/appcast_snapshot.xml .
@ -17,7 +18,7 @@ echo "### Commiting and pushing appcast"
git commit -S -am "Bump appcast to ${COMPOUND_VERSION}"
git push origin HEAD:"${BRANCH}"
if [ "${IS_SNAPSHOT}" = false ] ; then
if [ "${IS_SNAPSHOT}" = false ] && [ "${UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE}" = true ] ; then
git reset --hard @
git checkout develop
git merge master

View File

@ -27,6 +27,7 @@ Builds a new snapshot of VimR and pushes the tag:<br>
textParam('RELEASE_NOTES', null, 'Release notes')
booleanParam('IS_SNAPSHOT', true)
booleanParam('UPDATE_APPCAST', true)
booleanParam('UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE', true)
}
scm {