jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403566 )
Change subject: release: move get_git() to function, fix up export_dir
......................................................................
release: move get_git() to function, fix up export_dir
Change-Id: If2465d382e291c45ba32b1ced771ce753947cee8
---
M make-release/makerelease.py
1 file changed, 37 insertions(+), 38 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/makerelease.py b/make-release/makerelease.py
index 9b77938..3e09433 100755
--- a/make-release/makerelease.py
+++ b/make-release/makerelease.py
@@ -128,6 +128,40 @@
os.chdir(old_dir)
+def get_git(target, git_ref):
+ """Clone core"""
+ old_dir = os.getcwd()
+
+ if os.path.exists(target):
+ logging.info('Updating core in %s...', target)
+ proc = subprocess.Popen(
+ ['sh', '-c', 'cd ' + target + '; git fetch -q --all'])
+ else:
+ logging.info('Cloning core into %s...', target)
+ repo = 'https://gerrit.wikimedia.org/r/p/mediawiki/core'
+ proc = subprocess.Popen(['git', 'clone', '--recursive', repo, target])
+
+ if proc.wait() != 0:
+ raise RuntimeError('git clone failed')
+
+ os.chdir(target)
+
+ logging.debug("Checking out %s in %s...", git_ref, target)
+ proc = subprocess.Popen(['git', 'checkout', git_ref])
+
+ if proc.wait() != 0:
+ raise RuntimeError('git checkout failed')
+
+ logging.debug("Checking out submodules in %s...", target)
+ proc = subprocess.Popen(['git', 'submodule', 'update', '--init',
+ '--recursive'])
+
+ if proc.wait() != 0:
+ raise RuntimeError('git submodule update failed, exiting')
+
+ os.chdir(old_dir)
+
+
class MwVersion(object):
"""Abstract out a MediaWiki version"""
@@ -384,45 +418,10 @@
return False
print('Please type "y" for yes or "n" for no')
- def get_git(self, repo, target, git_ref):
- old_dir = os.getcwd()
-
- if os.path.exists(target):
- logging.info("Updating %s in %s...", repo, target)
- proc = subprocess.Popen(
- ['sh', '-c', 'cd ' + target + '; git fetch -q --all'])
- else:
- logging.info("Cloning %s into %s...", repo, target)
- repo = 'https://gerrit.wikimedia.org/r/p/mediawiki/' + repo
- proc = subprocess.Popen(['git', 'clone', '--recursive', repo,
target])
-
- if proc.wait() != 0:
- logging.error("git clone failed, exiting")
- sys.exit(1)
-
- os.chdir(target)
-
- logging.debug("Checking out %s in %s...", git_ref, target)
- proc = subprocess.Popen(['git', 'checkout', git_ref])
-
- if proc.wait() != 0:
- logging.error("git checkout failed, exiting")
- sys.exit(1)
-
- logging.debug("Checking out submodules in %s...", target)
- proc = subprocess.Popen(['git', 'submodule', 'update', '--init',
- '--recursive'])
-
- if proc.wait() != 0:
- logging.error("git submodule update failed, exiting")
- sys.exit(1)
-
- os.chdir(old_dir)
-
- def export(self, git_ref, module, export_dir, patches=None):
+ def export(self, git_ref, export_dir, patches=None):
if patches:
git_ref = self.version.branch
- self.get_git('core', os.path.join(export_dir, module), git_ref)
+ get_git(export_dir, git_ref)
maybe_apply_patches(export_dir, patches)
def make_patch(self, dest_dir, patch_file_name, dir1, dir2, patch_type):
@@ -505,7 +504,7 @@
package = 'mediawiki-' + version.raw
# Export the target
- self.export(tag, package, build_dir,
+ self.export(tag, os.path.join(build_dir, package),
get_patches_for_repo(patch_dir, 'core', version.branch))
os.chdir(os.path.join(build_dir, package))
--
To view, visit https://gerrit.wikimedia.org/r/403566
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If2465d382e291c45ba32b1ced771ce753947cee8
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: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
