jenkins-bot has submitted this change and it was merged.
Change subject: Don't create tags or branches for alpha
......................................................................
Don't create tags or branches for alpha
Change-Id: I83bbcf65f538de415711d03d0f8f116e6f4790bf
---
M scripts/prepare-release.py
1 file changed, 10 insertions(+), 4 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/prepare-release.py b/scripts/prepare-release.py
index b77e3dd..2d6ea3e 100755
--- a/scripts/prepare-release.py
+++ b/scripts/prepare-release.py
@@ -281,15 +281,17 @@
transform_file(p(dir_path, 'AndroidManifest.xml'), target, channel,
package, uprev, set_version_code)
-def make_release(target, channel, package, uprev):
+def make_release(target, channel, package, uprev, tag=True, branch=True):
# other changes on a new branch
- sh.git.checkout('-b', 'releases/%s' % get_release_name(target))
+ if branch:
+ 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)
sh.cd(PATH_PREFIX)
sh.git.add('-u')
sh.git.commit('-m', 'Make release %s for %s' % (get_release_name(target),
channel))
- git_tag(target)
+ if tag:
+ git_tag(target)
def bump(target, channel, package, uprev):
@@ -360,7 +362,11 @@
print('BUMP NOTICE! Then re-run the script with --bump --push.')
print('BUMP NOTICE!')
else:
- make_release(target, channel, package, uprev)
+ # No tags or branches for alpha
+ if args.alpha:
+ make_release(target, channel, package, uprev, False, False)
+ else:
+ make_release(target, channel, package, uprev)
print('Please build the APK and test. After that, run w/ --push flag,
and as needed release the tested APK.')
print('A useful command for collecting the release notes:')
print('git log --pretty=format:"%h %s" --abbrev-commit --no-merges
<previous release tag>..')
--
To view, visit https://gerrit.wikimedia.org/r/155799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83bbcf65f538de415711d03d0f8f116e6f4790bf
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
