Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181004
Change subject: make-release: Fetch composer dependencies for core 1.25+
......................................................................
make-release: Fetch composer dependencies for core 1.25+
Starting with MediaWiki core 1.25, tarballs will need to
include dependencies specified in core's composer.json file.
This runs `composer install --no-dev` inside the checkout
of core, and it is included in the tarball.
A --composer argument can be passed to specify the location
of a `composer` executable, otherwise it assumes that
composer is in your path.
Tested that a snapshot build of master did include the vendor/
directory, and creating a 1.19.13 tarball did not.
Bug: T74726
Change-Id: I59b135d659eeed71af6929a62c5aff8e18f85931
---
M make-release/make-release.py
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/04/181004/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index 5c58893..dc60d29 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -162,6 +162,11 @@
default=False, action='store_true',
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`'
+ )
return parser.parse_args()
@@ -436,6 +441,18 @@
os.chdir(oldDir)
+ def install_composer_dependencies(self, directory):
+ cwd = os.getcwd()
+ os.chdir(directory)
+ print 'Installing composer dependencies...'
+ proc = subprocess.Popen([self.options.composer, 'install', '--no-dev'])
+ if proc.wait() != 0:
+ print "Installing composer dependencies failed, exiting"
+ sys.exit(1)
+
+ os.chdir(cwd)
+ print "Fetched external composer dependencies"
+
def patchExport(self, patch, dir):
gitRoot = self.options.gitroot
@@ -460,6 +477,9 @@
dir = exportDir + '/' + module
self.getGit(gitRoot + '/core', dir, "core", tag)
+ # 1.25+ has composer dependencies. None means master
+ if self.version.major >= '1.25' or self.version.major is None:
+ self.install_composer_dependencies(dir)
print "Done"
--
To view, visit https://gerrit.wikimedia.org/r/181004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I59b135d659eeed71af6929a62c5aff8e18f85931
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
