jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403563 )
Change subject: releases: make patch_dir configurable (and only configurable)
......................................................................
releases: make patch_dir configurable (and only configurable)
Change-Id: I4012ae5f6379a88d407d1cf05a6401ec1198047b
---
M make-release/.gitignore
M make-release/makerelease.py
2 files changed, 13 insertions(+), 8 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/.gitignore b/make-release/.gitignore
index b08d6de..41730ff 100644
--- a/make-release/.gitignore
+++ b/make-release/.gitignore
@@ -1,3 +1,2 @@
*.gz
/build/
-/patches/
diff --git a/make-release/makerelease.py b/make-release/makerelease.py
index 173a8b3..e822d19 100755
--- a/make-release/makerelease.py
+++ b/make-release/makerelease.py
@@ -86,6 +86,10 @@
action='store_true',
help='List all bundled extensions for the given version and quit'
)
+ parser.add_argument(
+ '--patch-dir', dest='patch_dir', default=None,
+ help='Where to source patch files from'
+ )
return parser.parse_args()
@@ -476,6 +480,7 @@
def do_release(self, version, extensions=None):
root_dir = self.options.buildroot
+ patch_dir = self.options.patch_dir
# variables related to the version
branch = version.branch
@@ -491,7 +496,6 @@
os.mkdir(root_dir)
build_dir = root_dir + '/build'
- patch_dir = root_dir + '/patches'
if not os.path.exists(build_dir):
logging.debug('Creating build dir: %s', build_dir)
@@ -507,15 +511,17 @@
os.chdir(os.path.join(build_dir, package))
subprocess.check_output(['composer', 'update', '--no-dev'])
- maybe_apply_patches(
- os.path.join(package, 'vendor'),
- get_patches_for_repo(patch_dir, 'vendor', version.branch))
+ if patch_dir:
+ maybe_apply_patches(
+ os.path.join(package, 'vendor'),
+ get_patches_for_repo(patch_dir, 'vendor', version.branch))
ext_exclude = []
for ext in self.get_extensions_for_version(version, extensions):
- maybe_apply_patches(
- os.path.join(package, ext),
- get_patches_for_repo(patch_dir, ext, version.branch))
+ if patch_dir:
+ maybe_apply_patches(
+ os.path.join(package, ext),
+ get_patches_for_repo(patch_dir, ext, version.branch))
ext_exclude.append("--exclude")
ext_exclude.append(ext)
--
To view, visit https://gerrit.wikimedia.org/r/403563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4012ae5f6379a88d407d1cf05a6401ec1198047b
Gerrit-PatchSet: 2
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
