From 85085037c307806e379c4f5ac2e394faaacba111 Mon Sep 17 00:00:00 2001 From: Jeff Chan Date: Thu, 13 Mar 2014 05:23:52 +0000 Subject: [PATCH 1/2] Add HHVM to Travis Currently 1 test is still failing, so it's set up to allow for failures. See: https://github.com/facebook/hhvm/issues/2018 Signed-off-by: Jeff Chan --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6451668d96..2856228315 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ php: - "5.5" - "5.4" - "5.3" + - hhvm before_install: - sudo apt-get update -qq - sudo apt-get install -qq ant @@ -19,3 +20,7 @@ script: - if [[ $TRAVIS_PULL_REQUEST != "false" ]] ; then ./scripts/check-dco origin/$TRAVIS_BRANCH..FETCH_HEAD ; fi after_script: - php vendor/bin/coveralls -v +matrix: + allow_failures: + - php: hhvm + fast_finish: true From 4749251cc8c3234f97ab1605d89b61718f56ed1a Mon Sep 17 00:00:00 2001 From: Jeff Chan Date: Thu, 13 Mar 2014 06:02:35 +0000 Subject: [PATCH 2/2] Only install runkit / pear selenium when normal PHP Also, use Travis' composer binary Signed-off-by: Jeff Chan --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2856228315..c43a122821 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,12 +8,11 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq ant before_script: - - git clone git://github.com/zenovich/runkit.git && cd runkit && phpize && ./configure && make && make install && cd .. - - phpenv config-add test/travis.php.ini - - pear channel-discover pear.phpunit.de - - pear install phpunit/PHPUnit_Selenium - - curl -s http://getcomposer.org/installer | php - - php composer.phar install --dev --no-interaction + - if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then git clone git://github.com/zenovich/runkit.git && cd runkit && phpize && ./configure && make && make install && cd .. ; fi + - if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then phpenv config-add test/travis.php.ini ; fi + - if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then pear channel-discover pear.phpunit.de ; fi + - if [[ $TRAVIS_PHP_VERSION != "hhvm" ]] ; then pear install phpunit/PHPUnit_Selenium ; fi + - composer install --dev --no-interaction script: - ./scripts/generate-mo --quiet - PHPUNIT_ARGS=--debug ant phpunit lint