Skip to content

Commit 63e1536

Browse files
committed
make-snapshot: Don't fail when composer.lock didn't change
1 parent a3a9a0f commit 63e1536

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

bin/make-snapshot.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ git mv composer.lock composer.lock.bak
2323
git commit -am "Backup composer.lock"
2424
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
2525
git mv -f composer.lock.bak composer.lock
26-
git commit -am "Restore composer.lock"
26+
git commit -am "Restore composer.lock" || true # in case composer.lock was not modified
2727

2828
bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout

0 commit comments

Comments
 (0)