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

make-snapshot: Don't fail when composer.lock didn't change

Browse Source
This commit is contained in:
Johannes Meyer 2025-07-17 08:39:57 +02:00
parent a3a9a0f9a8
commit 63e153614d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/make-snapshot.sh
View File

@ -23,6 +23,6 @@ git mv composer.lock composer.lock.bak
git commit -am "Backup composer.lock" git commit -am "Backup composer.lock"
git merge --no-ff -m "Merge latest tag, package pipelines require it" $LATEST_TAG || git checkout --ours composer.lock.bak && git add composer.lock.bak && git commit --no-edit git merge --no-ff -m "Merge latest tag, package pipelines require it" $LATEST_TAG || git checkout --ours composer.lock.bak && git add composer.lock.bak && git commit --no-edit
git mv -f composer.lock.bak composer.lock git mv -f composer.lock.bak composer.lock
git commit -am "Restore composer.lock" git commit -am "Restore composer.lock" || true # in case composer.lock was not modified
bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout