jenkins-bot has submitted this change and it was merged.

Change subject: Fix php53lint exclusion, and missing php55lint to mw/vendor gate
......................................................................


Fix php53lint exclusion, and missing php55lint to mw/vendor gate

Change-Id: I4487d0cea6528ff0df61217938732b3ea154e96c
---
M zuul/layout.yaml
1 file changed, 10 insertions(+), 2 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bcfc548..4ea1d74 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -641,11 +641,11 @@
     files:
      - '^composer.json$'
 
-  - name: ^.*-php53lint$
+  - name: ^.*-php5[35]lint$
     files:
      - '^.*\.(php|php5|phtml|inc)$'
 
-  - name: php53lint
+  - name: ^php5[35]lint$
     files:
      - '^.*\.(php|php5|phtml|inc)$'
 
@@ -666,8 +666,15 @@
   - name: ^.*php53.*$
     branch: (?:^REL1_2[3-6]$)
 
+  - name: php53lint
+    branch: (?:^REL1_2[3-6]$)
+
   # PHP 5.5 builds not triggered on REL1_23-26
   - name: ^.*php55.*$
+    branch: (?!REL1_2[3-6]$)
+    parameter-function: set_php_bin
+
+  - name: php55lint
     branch: (?!REL1_2[3-6]$)
     parameter-function: set_php_bin
 
@@ -1614,6 +1621,7 @@
       - mediawiki-phpunit-parsertests-php53
     gate-and-submit:
       - php53lint
+      - php55lint
       - mediawiki-phpunit-hhvm
       - mediawiki-phpunit-parsertests-hhvm
       - mediawiki-phpunit-php53

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4487d0cea6528ff0df61217938732b3ea154e96c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to