[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Fix a billion things wrong with branch handling and submodules
Chad has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363986 )
Change subject: Fix a billion things wrong with branch handling and submodules
..
Fix a billion things wrong with branch handling and submodules
Change-Id: Idd113e6506dbf909bba8668bd364e077db0bc38b
---
M make-release/make-release.py
1 file changed, 17 insertions(+), 7 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/make-release.py b/make-release/make-release.py
index 228a0e4..8641b21 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -413,6 +413,14 @@
logging.error("git checkout failed, exiting")
sys.exit(1)
+logging.debug("Checking out submodules in %s...", dir)
+proc = subprocess.Popen(['git', 'submodule', 'update', '--init',
+ '--recursive'])
+
+if proc.wait() != 0:
+logging.error("git submodule update failed, exiting")
+sys.exit(1)
+
os.chdir(oldDir)
def export(self, gitRef, module, exportDir, patches=[]):
@@ -422,9 +430,6 @@
self.getGit('core', dir, gitRef)
for patch in patches:
self.applyPatch(patch, dir)
-# 1.25+ has composer dependencies and needs mediawiki/vendor.
-if self.version.major >= '1.25' or self.version.major == 'snapshot':
-self.getGit('vendor', dir + '/vendor', self.version.branch)
logging.info('Done with exporting core')
@@ -432,8 +437,10 @@
# We started doing them as submodules instead
if self.version.major < '1.29':
self.getGit(extension, dir + '/' + extension, branch)
+
for patch in patches:
self.applyPatch(patch, dir + '/' + extension)
+
logging.info('Done with exporting %s', extension)
def makePatch(self, destDir, patchFileName, dir1, dir2, type):
@@ -539,13 +546,16 @@
package = 'mediawiki-' + version.raw
# Export the target
-patches = self.get_patches_for_repo('core', patchDir)
-self.export(tag, package, buildDir, patches)
+self.export(tag, package, buildDir,
+self.get_patches_for_repo('core', patchDir))
+
+self.exportExtension(branch, 'vendor', package,
+ self.get_patches_for_repo('vendor', patchDir))
extExclude = []
for ext in self.get_extensions_for_version(version, extensions):
-patches = self.get_patches_for_repo(ext, patchDir)
-self.exportExtension(branch, ext, package, patches)
+self.exportExtension(branch, ext, package,
+ self.get_patches_for_repo(ext, patchDir))
extExclude.append("--exclude")
extExclude.append(ext)
--
To view, visit https://gerrit.wikimedia.org/r/363986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd113e6506dbf909bba8668bd364e077db0bc38b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad
Gerrit-Reviewer: Chad
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Fix a billion things wrong with branch handling and submodules
Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363986 )
Change subject: Fix a billion things wrong with branch handling and submodules
..
Fix a billion things wrong with branch handling and submodules
Change-Id: Idd113e6506dbf909bba8668bd364e077db0bc38b
---
M make-release/make-release.py
1 file changed, 17 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/86/363986/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index 228a0e4..8641b21 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -413,6 +413,14 @@
logging.error("git checkout failed, exiting")
sys.exit(1)
+logging.debug("Checking out submodules in %s...", dir)
+proc = subprocess.Popen(['git', 'submodule', 'update', '--init',
+ '--recursive'])
+
+if proc.wait() != 0:
+logging.error("git submodule update failed, exiting")
+sys.exit(1)
+
os.chdir(oldDir)
def export(self, gitRef, module, exportDir, patches=[]):
@@ -422,9 +430,6 @@
self.getGit('core', dir, gitRef)
for patch in patches:
self.applyPatch(patch, dir)
-# 1.25+ has composer dependencies and needs mediawiki/vendor.
-if self.version.major >= '1.25' or self.version.major == 'snapshot':
-self.getGit('vendor', dir + '/vendor', self.version.branch)
logging.info('Done with exporting core')
@@ -432,8 +437,10 @@
# We started doing them as submodules instead
if self.version.major < '1.29':
self.getGit(extension, dir + '/' + extension, branch)
+
for patch in patches:
self.applyPatch(patch, dir + '/' + extension)
+
logging.info('Done with exporting %s', extension)
def makePatch(self, destDir, patchFileName, dir1, dir2, type):
@@ -539,13 +546,16 @@
package = 'mediawiki-' + version.raw
# Export the target
-patches = self.get_patches_for_repo('core', patchDir)
-self.export(tag, package, buildDir, patches)
+self.export(tag, package, buildDir,
+self.get_patches_for_repo('core', patchDir))
+
+self.exportExtension(branch, 'vendor', package,
+ self.get_patches_for_repo('vendor', patchDir))
extExclude = []
for ext in self.get_extensions_for_version(version, extensions):
-patches = self.get_patches_for_repo(ext, patchDir)
-self.exportExtension(branch, ext, package, patches)
+self.exportExtension(branch, ext, package,
+ self.get_patches_for_repo(ext, patchDir))
extExclude.append("--exclude")
extExclude.append(ext)
--
To view, visit https://gerrit.wikimedia.org/r/363986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd113e6506dbf909bba8668bd364e077db0bc38b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
