Krinkle has submitted this change and it was merged.

Change subject: mediawiki-core-lint: Use phplint macro instead of repeating ant 
builder call
......................................................................


mediawiki-core-lint: Use phplint macro instead of repeating ant builder call

Also renamed php-lint to phplint for consistency.

Change-Id: Ic0d54a472cb98639f61d19d2e28377ae192e6ce6
---
M job-templates.yaml
M macro.yaml
M mediawiki.yaml
3 files changed, 3 insertions(+), 5 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/job-templates.yaml b/job-templates.yaml
index 1ba0647..d0f61e6 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -8,7 +8,7 @@
      - zuul
 
     builders:
-     - php-lint
+     - phplint
 
 # PHP CodeSniffer on everything under the workspace
 - job-template:
diff --git a/macro.yaml b/macro.yaml
index 3504b49..7e9d0b2 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -235,7 +235,7 @@
      - shell: "pyflakes"
 
 - builder:
-    name: php-lint
+    name: phplint
     builders:
      - ant:
         targets: 'php-lint'
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 44c35e5..9cb7593 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -26,9 +26,7 @@
     triggers:
      - zuul
     builders:
-     - ant:
-         targets: "php-lint"
-         buildfile: "/var/lib/jenkins/jobs/_shared/build.xml"
+     - phplint
 
 # Generic job to run JSHint
 - job-template:

-- 
To view, visit https://gerrit.wikimedia.org/r/59090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0d54a472cb98639f61d19d2e28377ae192e6ce6
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to