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

Change subject: Use phpunit via composer instead of phpunit.phar
......................................................................


Use phpunit via composer instead of phpunit.phar

This fixes hhvm tests on travis.

For some reason, the phpunit.phar has become a problem
when used with hhvm.

Bug: T95409
Change-Id: Ia101daa70d5f46dd12af9ca3e96d2b22d00799bf
---
M build/travis/install.sh
1 file changed, 2 insertions(+), 5 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  Aude: Checked
  jenkins-bot: Verified



diff --git a/build/travis/install.sh b/build/travis/install.sh
index fe630d6..498e748 100755
--- a/build/travis/install.sh
+++ b/build/travis/install.sh
@@ -19,10 +19,8 @@
 mv mediawiki-$MW phase3
 
 cd phase3
-composer install --no-dev
-wget https://phar.phpunit.de/phpunit.phar
-chmod +x phpunit.phar
-mv phpunit.phar tests/phpunit/
+composer self-update
+composer install
 
 mysql -e 'create database its_a_mw;'
 php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw 
--dbpath $(pwd) --pass nyan TravisWiki admin
@@ -38,5 +36,4 @@
 
 cd Wikibase
 
-composer self-update
 composer install --prefer-source

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia101daa70d5f46dd12af9ca3e96d2b22d00799bf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to