From ea7a62d3522ca03af904d55c4b0a48ef4e30bbc1 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 29 Feb 2016 10:40:34 +0100 Subject: [PATCH 1/3] Switch to Coveralls --- .scrutinizer.yml | 3 +-- .travis.yml | 11 ++++------- README.md | 2 +- composer.json | 3 +++ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 4bb53b4..97b9fac 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,3 +1,2 @@ tools: - external_code_coverage: - timeout: 600 + external_code_coverage: false diff --git a/.travis.yml b/.travis.yml index e55b1c3..8ed24bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,12 @@ php: - 5.4 - 5.5 - 5.6 - - nightly + - 7.0 - hhvm -# run build against nightly but allow them to fail matrix: fast_finish: true allow_failures: - - php: nightly - php: hhvm # faster builds on new travis setup not using sudo @@ -30,9 +28,8 @@ before_script: - composer install --prefer-dist --no-interaction script: - - phpunit --coverage-clover=coverage.clover + - mkdir -p build/logs + - phpunit -v --coverage-clover build/logs/clover.xml after_script: - - | - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover coverage.clover + - php vendor/bin/coveralls -v diff --git a/README.md b/README.md index 27d933a..60dfcb5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Readability [![Build Status](https://travis-ci.org/j0k3r/php-readability.svg?branch=master)](https://travis-ci.org/j0k3r/php-readability) -[![Code Coverage](https://scrutinizer-ci.com/g/j0k3r/php-readability/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/j0k3r/php-readability/?branch=master) +[![Coverage Status](https://coveralls.io/repos/j0k3r/php-readability/badge.svg?branch=master&service=github)](https://coveralls.io/github/j0k3r/php-readability/?branch=master) This is an extract of the Readability class from this [full-text-rss](https://github.com/Dither/full-text-rss) fork. It can be defined as a better version of the original [php-readability](https://bitbucket.org/fivefilters/php-readability/overview). diff --git a/composer.json b/composer.json index 6727aac..5487a5c 100644 --- a/composer.json +++ b/composer.json @@ -26,6 +26,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "satooshi/php-coveralls": "~0.6" + }, "autoload": { "psr-4": { "Readability\\": "src/" } } From 438699ab1546fdf2d70ae6510bb5fc0181f0610e Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 29 Feb 2016 10:50:14 +0100 Subject: [PATCH 2/3] Disable html coverage Required only on local. --- phpunit.xml.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6a5fee8..154e969 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -26,7 +26,7 @@ - + From 8cbecd7e99094323708326c8d895f3b668c358bf Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 29 Feb 2016 10:57:05 +0100 Subject: [PATCH 3/3] Use cache for Travis And also avoid Github api limit --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8ed24bb..8cb01d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,17 @@ matrix: # faster builds on new travis setup not using sudo sudo: false +# cache vendor dirs +cache: + directories: + - vendor + - $HOME/.composer/cache + install: - composer self-update before_script: + - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi; # disable TLS for composer because openssl is disabled for PHP 5.3.3 on travis # see: https://blog.travis-ci.com/upcoming_ubuntu_11_10_migration/ - if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- disable-tls true; fi;