Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155799
Change subject: Don't fail if branch or tag for release already exists
......................................................................
Don't fail if branch or tag for release already exists
Change-Id: I83bbcf65f538de415711d03d0f8f116e6f4790bf
---
M scripts/prepare-release.py
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/99/155799/1
diff --git a/scripts/prepare-release.py b/scripts/prepare-release.py
index f73b30c..5535565 100755
--- a/scripts/prepare-release.py
+++ b/scripts/prepare-release.py
@@ -118,9 +118,9 @@
def git_tag(target):
"""
- Creates an annotated git tag for this release
+ Creates an annotated git tag for this release, replace if it exists
"""
- sh.git.tag('-a', get_git_tag_name(target), '-m', target)
+ sh.git.tag('-f', '-a', get_git_tag_name(target), '-m', target)
def push_to_gerrit(target):
@@ -279,6 +279,7 @@
def make_release(target, channel, package, uprev):
# other changes on a new branch
+ sh.git.branch('-D', 'releases/%s' % get_release_name(target))
sh.git.checkout('-b', 'releases/%s' % get_release_name(target))
transform_project('wikipedia', target, channel, package, uprev)
transform_project('wikipedia-it', target, channel, package, uprev)
--
To view, visit https://gerrit.wikimedia.org/r/155799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83bbcf65f538de415711d03d0f8f116e6f4790bf
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
