From ede9a62230f05aab410661d4b2c2f2eb5baa99f3 Mon Sep 17 00:00:00 2001 From: addshore Date: Thu, 27 Feb 2014 15:06:13 +0100 Subject: [PATCH] Make travis test php 5.3, 5.4 and 5.5 Currently these are all set to be allowed to fail as currently some tests do fail but having this run will allow us to slowly fix them and remove the versions from allow_failures The jobs for 5.3 5.4 and 5.5 seem to take somewhere between 6 and 9 mins compared to hhvm which takes about 4 but this should be no problem Change-Id: Ifee7f6476cfd41736aa595e92260a333b4c059ee --- .travis.yml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a1ae80c0c..eb05fe29f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,21 @@ # The Wikimedia Foundation uses a self-hosted Jenkins instance to run unit # tests, but it tests code against the version of PHP that is deployed on # Wikimedia's production cluster. This Travis CI configuration is designed to -# complement that setup by testing MediaWiki against HHVM. +# complement that setup by testing MediaWiki on travis # language: php php: - hhvm + - 5.3 + - 5.4 + - 5.5 + +matrix: + allow_failures: + - php: 5.3 + - php: 5.4 + - php: 5.5 services: - mysql @@ -29,7 +38,7 @@ before_script: # Travis CI's HHVM environment provides PHPUnit as a phar file, but # MediaWiki's test suite only works if individual PHPUnit files are # actual files on disk (bug 58881). - - composer require 'phpunit/phpunit=3.7.*' --prefer-source + - composer require 'phpunit/phpunit=3.7.*' --prefer-source - > php maintenance/install.php testwiki admin --pass travis @@ -40,7 +49,13 @@ before_script: script: - > - hhvm --php - -d include_path=".$(printf ':%s' vendor/phpunit/*)" - -d date.timezone="Etc/UTC" - tests/phpunit/phpunit.php + if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; + then + hhvm --php \ + -d include_path=".$(printf ':%s' vendor/phpunit/*)" \ + -d date.timezone="Etc/UTC" \ + tests/phpunit/phpunit.php + else + php tests/phpunit/phpunit.php \ + --with-phpunitdir ./vendor/phpunit/phpunit + fi -- 2.20.1