Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403173 )
Change subject: branch.py: First half of sub-submodule support
......................................................................
branch.py: First half of sub-submodule support
Change-Id: Ie6420a0f47722f380dc476daf164b7d98a0caed0
---
M make-release/branch.py
M make-release/make-release.yaml
2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/73/403173/1
diff --git a/make-release/branch.py b/make-release/branch.py
index f7051a0..3a6e9b9 100755
--- a/make-release/branch.py
+++ b/make-release/branch.py
@@ -50,6 +50,13 @@
else:
raise
+ # If we've got a sub-submodule we care about, branch it too
+ try:
+ subrepo = CONFIG['sub_submodules'][repo]
+ create_branch(subrepo, branch, revision)
+ except KeyError:
+ pass
+
def get_bundle(bundle):
"""Return the list of all/some extensions, skins, and vendor."""
@@ -69,10 +76,11 @@
def do_core_work(branch, bundle, version):
+ """Add submodules, bump $wgVersion, etc"""
cwd = os.getcwd()
with tempfile.TemporaryDirectory() as temp:
subprocess.check_call(['/usr/bin/git', 'clone', '-b', branch,
- CONFIG['clone_base'] + '/core', temp])
+ CONFIG['clone_base'] + '/core', temp])
os.chdir(temp)
for submodule in bundle:
url = CONFIG['clone_base'] + '/' + submodule
diff --git a/make-release/make-release.yaml b/make-release/make-release.yaml
index 7b79a3e..c5a2551 100644
--- a/make-release/make-release.yaml
+++ b/make-release/make-release.yaml
@@ -30,6 +30,8 @@
core: 0cd28e19cb0f9385a2a1cc11a4d8c9c21ff0b830
REL1_30:
core: 0cd28e19cb0f9385a2a1cc11a4d8c9c21ff0b830
+sub_submodules:
+ - extensions/VisualEditor: lib/ve
diff:
ignore:
- "*~"
--
To view, visit https://gerrit.wikimedia.org/r/403173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6420a0f47722f380dc476daf164b7d98a0caed0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <ch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
