jenkins-bot has submitted this change and it was merged.
Change subject: Use mediawiki/vendor repository to fetch composer dependencies
......................................................................
Use mediawiki/vendor repository to fetch composer dependencies
Bug: T108634
Change-Id: I58f0aee9f443fc08222053c841f3d7740da34382
---
M make-release/make-release.py
1 file changed, 3 insertions(+), 23 deletions(-)
Approvals:
Chad: Looks good to me, approved
Legoktm: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/make-release/make-release.py b/make-release/make-release.py
index ed18e63..86cfb42 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -110,11 +110,6 @@
help='Do not perform actions (e.g. git pull) that require the network'
)
parser.add_argument(
- '--composer', dest='composer',
- default='composer',
- help='Location to composer executable, defaults to `composer`'
- )
- parser.add_argument(
'--list-bundled', dest='list_bundled',
action='store_true',
help='List all bundled extensions for the given version and quit'
@@ -450,22 +445,6 @@
os.chdir(oldDir)
- def install_composer_dependencies(self, directory):
- if self.options.offline:
- logging.warning(
- 'Composer dependencies cannot be fetched in offline mode')
- return
- cwd = os.getcwd()
- os.chdir(directory)
- logging.debug('Installing composer dependencies...')
- proc = subprocess.Popen([self.options.composer, 'install', '--no-dev'])
- if proc.wait() != 0:
- logging.error("Installing composer dependencies failed, exiting")
- sys.exit(1)
-
- os.chdir(cwd)
- logging.info("Fetched external composer dependencies")
-
def export(self, gitRef, module, exportDir, patches=[]):
gitRoot = self.options.gitroot
@@ -476,9 +455,10 @@
self.getGit(gitRoot + '/core', dir, "core", gitRef)
for patch in patches:
self.applyPatch(patch, dir)
- # 1.25+ has composer dependencies.
+ # 1.25+ has composer dependencies and needs mediawiki/vendor.
if self.version.major >= '1.25' or self.version.major == 'snapshot':
- self.install_composer_dependencies(dir)
+ self.getGit(gitRoot + '/vendor', dir + '/vendor',
+ 'vendor', self.version.branch)
logging.info('Done with exporting core')
--
To view, visit https://gerrit.wikimedia.org/r/255401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58f0aee9f443fc08222053c841f3d7740da34382
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
