jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404787 )
Change subject: branch.py: Add $wgVersion fixing in DefaultSettings
......................................................................
branch.py: Add $wgVersion fixing in DefaultSettings
Change-Id: I4887a8ba30e98ae0912edd510bbf81fd6a6be246
---
M make-release/branch.py
1 file changed, 14 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
20after4: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/make-release/branch.py b/make-release/branch.py
index 8aff26f..1cad5da 100755
--- a/make-release/branch.py
+++ b/make-release/branch.py
@@ -6,6 +6,7 @@
from contextlib import contextmanager
import logging
import os
+import re
import shutil
import subprocess
import sys
@@ -95,6 +96,11 @@
shutil.rmtree(temp)
+WGVERSION_REGEX = re.compile(
+ r'^( \$wgVersion \s+ = \s+ ) [^;]* ( ; \s* ) $',
+ re.MULTILINE | re.VERBOSE)
+
+
def do_core_work(branch, bundle, version):
"""Add submodules, bump $wgVersion, etc"""
cwd = os.getcwd()
@@ -104,7 +110,14 @@
subprocess.check_call(['/usr/bin/git', 'submodule', 'add',
'--force', '--branch', branch, url,
submodule])
- # something with defaultsettings
+
+ with open('includes/DefaultSettings.php', 'r') as defaultsettings:
+ contents = defaultsettings.read()
+
+ with open('includes/DefaultSettings.php', 'w') as defaultsettings:
+ defaultsettings.write(WGVERSION_REGEX.sub(
+ r"\1'" + version + r"'\2", contents))
+
subprocess.check_call(['/usr/bin/git', 'commit', '-a', '-m',
'Creating new %s branch' % branch])
subprocess.check_call(['/usr/bin/git', 'push', 'origin',
--
To view, visit https://gerrit.wikimedia.org/r/404787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4887a8ba30e98ae0912edd510bbf81fd6a6be246
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
