Skip to content

Commit

Permalink
Merge 9e8d317 into d1aa034
Browse files Browse the repository at this point in the history
  • Loading branch information
Bilge committed Jan 24, 2017
2 parents d1aa034 + 9e8d317 commit 308e10f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
1 change: 0 additions & 1 deletion .coveralls.yml

This file was deleted.

21 changes: 5 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,13 @@ before_script:
fi
script:
- |
if [[ $TRAVIS_PHP_VERSION != hhvm \
&& $TRAVIS_PHP_VERSION != hhvm-nightly \
&& $TRAVIS_PHP_VERSION != 7.0 ]]; then
vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
else
vendor/bin/phpunit
fi
- vendor/bin/phpunit --coverage-text --coverage-clover=${clover=build/logs/clover.xml}

after_success:
- |
if [[ $TRAVIS_PHP_VERSION = 5.6 ]]; then
composer require satooshi/php-coveralls:~0.7@dev
vendor/bin/coveralls -v
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
fi
- composer require satooshi/php-coveralls
- vendor/bin/coveralls -v
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover "$clover"

notifications:
email:
Expand Down

0 comments on commit 308e10f

Please sign in to comment.