tyler.durden/icinga-php-thirdparty
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-php-thirdparty.git synced 2025-07-26 23:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

bin/make-snapshot.sh: Merge latest stable again

Browse Source 
While git describe isn't used anymore, something else
is and this still requires a reachable tag…

fixes #38
This commit is contained in:
Johannes Meyer 2025-03-26 11:40:15 +01:00
parent 818b63f028
commit 515540e633
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/make-snapshot.sh
View File

@ -18,4 +18,11 @@ if [[ -n $(git branch | grep $BRANCH) ]]; then
fi
git checkout -b $BRANCH
git mv composer.lock composer.lock.bak
git commit -am "Backup composer.lock"
git merge --no-ff -m "Merge latest tag, package pipelines require it" $LATEST_TAG
git mv -f composer.lock.bak composer.lock
git commit -am "Restore composer.lock"
bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout