jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399889 )
Change subject: make-release: Actually make snapshot names sensible
......................................................................
make-release: Actually make snapshot names sensible
Change-Id: I26f292839d5144b09e4b9b1f2a5d9a0f733ef9bc
---
M make-release/makerelease.py
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/makerelease.py b/make-release/makerelease.py
index a9463a7..28032df 100755
--- a/make-release/makerelease.py
+++ b/make-release/makerelease.py
@@ -108,8 +108,9 @@
self.cycle = decomposed.get('cycle', None)
@classmethod
- def new_snapshot(cls):
- return cls('snapshot-' + time.strftime('%Y%m%d', time.gmtime()))
+ def new_snapshot(cls, branch='master'):
+ return cls('snapshot-{}-{}'.format(
+ branch, time.strftime('%Y%m%d', time.gmtime())))
def __repr__(self):
if self.raw is None:
@@ -224,7 +225,7 @@
"""Surprisingly: do a MediaWiki release"""
def __init__(self, ops):
if ops.version is None:
- self.version = MwVersion.new_snapshot()
+ self.version = MwVersion.new_snapshot(ops.branch)
else:
self.version = MwVersion(ops.version)
self.options = ops
@@ -300,7 +301,7 @@
# No version specified, assuming a snapshot release
if self.options.version is None:
self.do_release(
- version=MwVersion.new_snapshot())
+ version=MwVersion.new_snapshot(self.options.branch))
return 0
if self.options.previousversion:
--
To view, visit https://gerrit.wikimedia.org/r/399889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26f292839d5144b09e4b9b1f2a5d9a0f733ef9bc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
