Hello Legoktm, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/337225
to review the following change.
Change subject: Revert "Rely on `php` in assert-phpflavor macro"
......................................................................
Revert "Rely on `php` in assert-phpflavor macro"
Bug: T157750
This reverts commit 584e5a8d8d22acfc7b73bca7c41bd6ec94b587f1.
Change-Id: I4543497578a185a9f1c9cebc307c50cc7132ca6f
---
M jjb/macro.yaml
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/25/337225/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index c9846e9..9e77b5d 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -210,12 +210,15 @@
;;
( 'php55' )
MATCHER='^PHP 5\.5'
+ PHP_VERSION=`php5 --version`
;;
( 'php56' )
MATCHER='^PHP 5\.6'
+ PHP_VERSION=`php5 --version`
;;
( 'php70' )
MATCHER='^PHP 7\.0'
+ PHP_VERSION=`php7.0 --version`
;;
( * )
echo "Invalid phpflavor '{phpflavor}' for JJB macro
'assert-phpflavor'"
--
To view, visit https://gerrit.wikimedia.org/r/337225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4543497578a185a9f1c9cebc307c50cc7132ca6f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <[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
