jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375062 )
Change subject: Don't hardcode extension assumption in thing.py
......................................................................
Don't hardcode extension assumption in thing.py
Change-Id: I87aab40deff238312be9c0ea5b2e23443528f54f
---
M container/thing.py
M run.py
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/container/thing.py b/container/thing.py
index 500cf80..e7381a6 100755
--- a/container/thing.py
+++ b/container/thing.py
@@ -246,7 +246,7 @@
msg=msg,
branch='master',
remote=gerrit_url(
- 'mediawiki/extensions/' + env['ext'],
+ env['repo'],
user=env['gerrit_user'],
pw=env['gerrit_pw']
),
@@ -257,7 +257,7 @@
def build_env():
return {
- 'ext': os.environ['EXT'],
+ 'repo': os.environ['REPO'],
'version': os.environ.get('VERSION'),
'package': os.environ['PACKAGE'],
'gerrit_user': os.environ.get('GERRIT_USER'),
@@ -266,9 +266,9 @@
def setup(env):
- gerrit = gerrit_url('mediawiki/extensions/' + env['ext'])
- subprocess.check_call(['git', 'clone', gerrit, '--depth=1'])
- os.chdir(env['ext'])
+ gerrit = gerrit_url(env['repo'])
+ subprocess.check_call(['git', 'clone', gerrit, 'repo', '--depth=1'])
+ os.chdir('repo')
subprocess.check_call(['grr', 'init']) # Install commit-msg hook
if env['version']:
# Also runs composer install
diff --git a/run.py b/run.py
index 90ec2f4..31a4d7c 100755
--- a/run.py
+++ b/run.py
@@ -65,7 +65,7 @@
def run(ext_name, version, mode):
env = {
'MODE': mode,
- 'EXT': ext_name,
+ 'REPO': 'mediawiki/extensions/' + ext_name,
'PACKAGE': 'mediawiki/mediawiki-codesniffer'
}
if version != 'same':
--
To view, visit https://gerrit.wikimedia.org/r/375062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87aab40deff238312be9c0ea5b2e23443528f54f
Gerrit-PatchSet: 1
Gerrit-Project: labs/libraryupgrader
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
