diff options
author | Michal Čihař <michal@cihar.com> | 2017-12-15 11:48:21 +0300 |
---|---|---|
committer | Michal Čihař <michal@cihar.com> | 2017-12-15 11:48:21 +0300 |
commit | dc0e9a5c453bbc185cf8ddd152552604d6083b0b (patch) | |
tree | 6d064ee54353033d5adadceada813aa78ec1befd /scripts | |
parent | 7f535fd84af5c9f1f626ffcd366b386dff7f7038 (diff) |
Restore worktree for composer.lock removal on release
The worktree is previously cleaned up, so it can't be reused.
Fixes #13613
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/create-release.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 35d85d4eb5..cdd52b471f 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -407,8 +407,15 @@ if [ $do_tag -eq 1 ] ; then echo "* Tagging release as $tagname" git tag -s -a -m "Released $version" $tagname $branch echo " Dont forget to push tags using: git push --tags" + echo "* Cleanup of $branch" + # Remove composer.lock, but we need to create fresh worktree for that + git worktree add --force $workdir $branch + cd $workdir git rm --force composer.lock git commit -s -m "Removing composer.lock" + cd ../.. + rm -rf $workdir + git worktree prune fi # Mark as stable release |