jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403141 )
Change subject: Drop export_ext() as dumb wrapper around patching
......................................................................
Drop export_ext() as dumb wrapper around patching
Just call patch functions directly.
Oh while we're here, provide proper composer support for
prior version diffing, as well as drop useless export_ext()
call that does nothing against an old version.
Change-Id: I6e898f9bb680f483a4ef1cda70808f1beda70d1d
---
M make-release/makerelease.py
1 file changed, 12 insertions(+), 19 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/makerelease.py b/make-release/makerelease.py
index 28032df..2d32637 100755
--- a/make-release/makerelease.py
+++ b/make-release/makerelease.py
@@ -389,16 +389,7 @@
if patches:
git_ref = self.version.branch
self.get_git('core', os.path.join(export_dir, module), git_ref)
- if patches:
- self.apply_patches(patches, export_dir)
-
- logging.info('Done with exporting core')
-
- def export_ext(self, branch, extension, input_dir, patches=None):
- if patches:
- self.apply_patches(patches, input_dir + '/' + extension)
-
- logging.info('Done with exporting %s', extension)
+ self.maybe_apply_patches(export_dir, patches)
def make_patch(self, dest_dir, patch_file_name, dir1, dir2, patch_type):
patch_file = open(dest_dir + "/" + patch_file_name, 'w')
@@ -430,7 +421,9 @@
logging.info('Done with making patch')
return diff_status == 1
- def apply_patches(self, patch_files, input_dir):
+ def maybe_apply_patches(self, input_dir, patch_files=None):
+ if not patch_files:
+ return
old_dir = os.getcwd()
os.chdir(input_dir)
for patch_file in patch_files:
@@ -508,13 +501,15 @@
os.chdir(os.path.join(build_dir, package))
subprocess.check_output(['composer', 'update', '--no-dev'])
- self.export_ext(branch, 'vendor', package,
- self.get_patches_for_repo('vendor', patch_dir))
+ self.maybe_apply_patches(
+ os.path.join(package, 'vendor'),
+ self.get_patches_for_repo('vendor', patch_dir))
ext_exclude = []
for ext in self.get_extensions_for_version(version, extensions):
- self.export_ext(branch, ext, package,
- self.get_patches_for_repo(ext, patch_dir))
+ self.maybe_apply_patches(
+ os.path.join(package, ext),
+ self.get_patches_for_repo(ext, patch_dir))
ext_exclude.append("--exclude")
ext_exclude.append(ext)
@@ -541,10 +536,8 @@
prev_mw_version = MwVersion(prev_version)
self.export(prev_mw_version.tag,
prev_dir, build_dir)
-
- for ext in self.get_extensions_for_version(MwVersion(prev_version),
- extensions):
- self.export_ext(branch, ext, prev_dir)
+ os.chdir(os.path.join(build_dir, prev_dir))
+ subprocess.check_output(['composer', 'update', '--no-dev'])
self.make_patch(
build_dir, package + '.patch.gz', prev_dir, package, 'normal')
--
To view, visit https://gerrit.wikimedia.org/r/403141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e898f9bb680f483a4ef1cda70808f1beda70d1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
