diff --git a/.appveyor.yml b/.appveyor.yml index 4a39c8fe234..52d38af5eb2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -74,15 +74,14 @@ install: $destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip" Invoke-WebRequest $source -OutFile $destination 7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vc15-x64.zip > $null - $DLLVersion = (Invoke-WebRequest "https://pecl.php.net/rest/r/xdebug/stable.txt").Content - $source = "https://xdebug.org/files/php_xdebug-$($DLLVersion)-$($env:php)-vc15-nts-x86_64.dll" - $destination = "c:\tools\php\ext\php_xdebug.dll" - Invoke-WebRequest $source -OutFile $destination + $DLLVersion = (Invoke-WebRequest "https://pecl.php.net/rest/r/pcov/stable.txt").Content + Invoke-WebRequest https://windows.php.net/downloads/pecl/releases/pcov/$($DLLVersion)/php_pcov-$($DLLVersion)-7.3-nts-vc15-$($env:platform).zip -OutFile pcov.zip + 7z x -y pcov.zip > $null Remove-Item c:\tools\php\* -include .zip cd c:\tools\php Add-Content php.ini "`nextension=php_sqlsrv.dll" Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll" - Add-Content php.ini "`nzend_extension=php_xdebug.dll" + Add-Content php.ini "`nextension=php_pcov.dll" Add-Content php.ini "`n" # download Composer @@ -123,8 +122,12 @@ test_script: $env:phpunit_config = "tests\appveyor\$($env:db).$($env:driver).appveyor.xml" } - vendor\bin\phpunit -c $($env:phpunit_config) + vendor\bin\phpunit -c $($env:phpunit_config) --coverage-clover clover.xml if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } + +after_test: + - appveyor DownloadFile https://codecov.io/bash -FileName codecov.sh + - bash codecov.sh -f clover.xml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 5222c21dfa5..00000000000 --- a/.coveralls.yml +++ /dev/null @@ -1,2 +0,0 @@ -coverage_clover: clover.xml -json_path: /tmp/coveralls-upload.json diff --git a/.travis.yml b/.travis.yml index 8445bea133c..68e57663255 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ before_install: - | if [ "x$COVERAGE" == "xyes" ]; then pecl install pcov-1.0.0 - wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.2.0/php-coveralls.phar --output-document="${HOME}/bin/coveralls" - chmod +x ${HOME}/bin/coveralls fi before_script: @@ -33,10 +31,10 @@ script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml fi -after_script: +after_success: - | if [ "x$COVERAGE" == "xyes" ]; then - travis_retry coveralls -v + bash <(curl -s https://codecov.io/bash) fi jobs: diff --git a/README.md b/README.md index e1c55fd1783..9c7f8b25501 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ |:----------------:|:----------:| | [![Build status][Master image]][Master] | [![Build status][2.10 image]][2.10] | | [![Build Status][ContinuousPHP image]][ContinuousPHP] | [![Build Status][ContinuousPHP 2.10 image]][ContinuousPHP] | -| [![Code Coverage][Coverage image]][Coveralls Master] | [![Code Coverage][Coverage 2.10 image]][Coveralls 2.10] | +| [![Code Coverage][Coverage image]][CodeCov Master] | [![Code Coverage][Coverage 2.10 image]][CodeCov 2.10] | | [![AppVeyor][AppVeyor master image]][AppVeyor master] | [![AppVeyor][AppVeyor 2.10 image]][AppVeyor 2.10] | Powerful database abstraction layer with many features for database schema introspection, schema management and PDO abstraction. @@ -16,18 +16,18 @@ Powerful database abstraction layer with many features for database schema intro * [Issue Tracker](https://github.com/doctrine/dbal/issues) [Master image]: https://img.shields.io/travis/doctrine/dbal/master.svg?style=flat-square - [Coverage image]: https://coveralls.io/repos/github/doctrine/dbal/badge.svg?branch=master + [Coverage image]: https://codecov.io/gh/doctrine/dbal/branch/master/graph/badge.svg [ContinuousPHP image]: https://img.shields.io/continuousphp/git-hub/doctrine/dbal/master.svg?style=flat-square [Master]: https://travis-ci.org/doctrine/dbal - [Coveralls Master]: https://coveralls.io/github/doctrine/dbal?branch=master + [CodeCov Master]: https://codecov.io/gh/doctrine/dbal/branch/master [AppVeyor master]: https://ci.appveyor.com/project/doctrine/dbal/branch/master [AppVeyor master image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/master?svg=true [ContinuousPHP]: https://continuousphp.com/git-hub/doctrine/dbal [2.10 image]: https://img.shields.io/travis/doctrine/dbal/2.10.x.svg?style=flat-square - [Coverage 2.10 image]: https://coveralls.io/repos/github/doctrine/dbal/badge.svg?branch=2.10.x + [Coverage 2.10 image]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x/graph/badge.svg [ContinuousPHP 2.10 image]: https://img.shields.io/continuousphp/git-hub/doctrine/dbal/2.10.x.svg?style=flat-square [2.10]: https://github.com/doctrine/dbal/tree/2.10.x - [Coveralls 2.10]: https://coveralls.io/github/doctrine/dbal?branch=2.10.x + [CodeCov 2.10]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x [AppVeyor 2.10]: https://ci.appveyor.com/project/doctrine/dbal/branch/2.10.x [AppVeyor 2.10 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/2.10.x?svg=true