Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352896 )
Change subject: make-release: Remove --gitroot, it's dumb
......................................................................
make-release: Remove --gitroot, it's dumb
Change-Id: Idd585806acd311008fff72afc8ba556bc94da71b
---
M make-release/make-release.py
1 file changed, 7 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/96/352896/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index f0e3aa1..228a0e4 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -68,11 +68,6 @@
help='include the SemanticMediaWiki bundle'
)
parser.add_argument(
- '--git-root', dest='gitroot',
- default='https://gerrit.wikimedia.org/r/p/mediawiki',
- help='base git URL to fetch projects from (defaults to Gerrit)'
- )
- parser.add_argument(
'--build', dest='buildroot',
default=os.getcwd(),
help='where the build should happen (defaults to pwd)'
@@ -393,15 +388,16 @@
return False
print('Please type "y" for yes or "n" for no')
- def getGit(self, repo, dir, label, gitRef):
+ def getGit(self, repo, dir, gitRef):
oldDir = os.getcwd()
if os.path.exists(dir):
- logging.info("Updating %s in %s...", label, dir)
+ logging.info("Updating %s in %s...", repo, dir)
proc = subprocess.Popen(
['sh', '-c', 'cd ' + dir + '; git fetch -q --all'])
else:
- logging.info("Cloning %s into %s...", label, dir)
+ logging.info("Cloning %s into %s...", repo, dir)
+ repo = 'https://gerrit.wikimedia.org/r/p/mediawiki/' + repo
proc = subprocess.Popen(['git', 'clone', '--recursive', repo, dir])
if proc.wait() != 0:
@@ -420,27 +416,22 @@
os.chdir(oldDir)
def export(self, gitRef, module, exportDir, patches=[]):
-
- gitRoot = self.options.gitroot
-
dir = exportDir + '/' + module
if patches:
gitRef = self.version.branch
- self.getGit(gitRoot + '/core', dir, "core", gitRef)
+ 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(gitRoot + '/vendor', dir + '/vendor',
- 'vendor', self.version.branch)
+ self.getGit('vendor', dir + '/vendor', self.version.branch)
logging.info('Done with exporting core')
def exportExtension(self, branch, extension, dir, patches=[]):
# We started doing them as submodules instead
if self.version.major < '1.29':
- self.getGit(self.options.gitroot + '/' + extension,
- dir + '/' + extension, extension, branch)
+ self.getGit(extension, dir + '/' + extension, branch)
for patch in patches:
self.applyPatch(patch, dir + '/' + extension)
logging.info('Done with exporting %s', extension)
--
To view, visit https://gerrit.wikimedia.org/r/352896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd585806acd311008fff72afc8ba556bc94da71b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
