mirror of
https://github.com/Icinga/icinga-php-thirdparty.git
synced 2025-07-22 21:24:43 +02:00
bin/make-snapshot.sh: Merge latest stable again
While git describe isn't used anymore, something else is and this still requires a reachable tag… fixes #38
This commit is contained in:
parent
818b63f028
commit
515540e633
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user