From 63e153614df70ecce9e749b195d5395537d266bd Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 17 Jul 2025 08:39:57 +0200 Subject: [PATCH] make-snapshot: Don't fail when composer.lock didn't change --- bin/make-snapshot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/make-snapshot.sh b/bin/make-snapshot.sh index 71ee4eb..e8040d2 100755 --- a/bin/make-snapshot.sh +++ b/bin/make-snapshot.sh @@ -23,6 +23,6 @@ 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 checkout --ours composer.lock.bak && git add composer.lock.bak && git commit --no-edit 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