From 5d4166196ad5bcde89f7316d273ef13eff144666 Mon Sep 17 00:00:00 2001 From: madflow Date: Fri, 2 Jun 2017 08:46:48 +0200 Subject: [PATCH 1/3] HHVM is no longer supported on Ubuntu Precise (#439) --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b23c7fd..631cd13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,13 @@ language: php +dist: trusty + php: - 5.4 - 5.5 - 5.6 - 7.0 - - hhvm + - hhvm-3.6 cache: directories: @@ -19,5 +21,5 @@ script: - php vendor/bin/phpunit --coverage-clover=build/logs/coverage.clover after_script: - - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi - - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover; fi + - if [[ $TRAVIS_PHP_VERSION != 'hhvm-3.6' && $TRAVIS_PHP_VERSION != '7.0' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi + - if [[ $TRAVIS_PHP_VERSION != 'hhvm-3.6' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover; fi From 40b4a57e6bfb29a7134542a824773495ed165b2f Mon Sep 17 00:00:00 2001 From: Adrien Loison Date: Mon, 19 Jun 2017 20:37:30 +0200 Subject: [PATCH 2/3] Update README.md (#442) --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 7725bb1..b63d95e 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,7 @@ For information, the performance tests take about 30 minutes to run (processing ## Support -Need to contact us directly? Email oss@box.com and be sure to include the name of this project in the subject. - -You can also ask questions, submit new features ideas or discuss about Spout in the chat room:
+You can ask questions, submit new features ideas or discuss about Spout in the chat room:
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/box/spout?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) ## Copyright and License From ee5dee61c760532bee09166d1bbd57011f97b3d0 Mon Sep 17 00:00:00 2001 From: Adrien Loison Date: Tue, 25 Jul 2017 14:02:17 +0200 Subject: [PATCH 3/3] Fix HHVM jobs on Travis (#451) --- .scrutinizer.yml | 2 +- .travis.yml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 42f2492..ef177ea 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -4,7 +4,7 @@ filter: tools: external_code_coverage: timeout: 600 # Wait 10 minutes for results - runs: 3 # Merge results for 5.4, 5.5 and 5.6 jobs + runs: 1 # Results are only coming from the PHP 7.1 job php_mess_detector: true php_code_sniffer: config: diff --git a/.travis.yml b/.travis.yml index 631cd13..3c17614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 - hhvm-3.6 cache: @@ -21,5 +22,8 @@ script: - php vendor/bin/phpunit --coverage-clover=build/logs/coverage.clover after_script: - - if [[ $TRAVIS_PHP_VERSION != 'hhvm-3.6' && $TRAVIS_PHP_VERSION != '7.0' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi - - if [[ $TRAVIS_PHP_VERSION != 'hhvm-3.6' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover; fi + - | + if [[ "$TRAVIS_PHP_VERSION" == '7.1' ]]; then + wget https://scrutinizer-ci.com/ocular.phar + php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover + fi