tyler.durden/icinga-php-library
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-php-library.git synced 2025-07-03 03:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

make-snapshot.sh: Merge tag instead of the stable branch

Browse Source
This commit is contained in:
Johannes Meyer 2021-07-20 10:10:51 +02:00
parent b95ef86df4
commit 15d91ced83
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/make-snapshot.sh
View File

@ -11,7 +11,6 @@ if [ -z $BRANCH ]; then
fi fi
LATEST_TAG=$(git for-each-ref refs/tags --sort=-taggerdate --format='%(refname)' --count=1 | awk -F/ '{print $3}') LATEST_TAG=$(git for-each-ref refs/tags --sort=-taggerdate --format='%(refname)' --count=1 | awk -F/ '{print $3}')
TAGGED_BRANCH="stable/${LATEST_TAG:1}"
NEXT_VERSION=$(echo "${LATEST_TAG:1}" | awk -F. -v OFS=. '{$3=0}; {++$2}; {print}') NEXT_VERSION=$(echo "${LATEST_TAG:1}" | awk -F. -v OFS=. '{$3=0}; {++$2}; {print}')
if [[ -n $(git branch | grep $BRANCH) ]]; then if [[ -n $(git branch | grep $BRANCH) ]]; then
@ -19,8 +18,7 @@ if [[ -n $(git branch | grep $BRANCH) ]]; then
fi fi
git checkout -b $BRANCH git checkout -b $BRANCH
git fetch origin $TAGGED_BRANCH git merge --no-ff -m "Merge latest tag, to make it reachable for git-describe" $LATEST_TAG
git merge --no-ff -m "Merge latest stable, to make the latest tag reachable" $TAGGED_BRANCH
composer require --no-update \ composer require --no-update \
ipl/html:@dev \ ipl/html:@dev \