Merge clovers

(cherry picked from commit fd7465521a)
This commit is contained in:
Simon Podlipsky 2018-12-30 06:51:55 +07:00 committed by Vladimir Razuvaev
parent ababa18157
commit 610979555d
3 changed files with 12 additions and 7 deletions

View File

@ -20,7 +20,7 @@ build:
tools: tools:
external_code_coverage: external_code_coverage:
timeout: 600 timeout: 900
build_failure_conditions: build_failure_conditions:
- 'elements.rating(<= C).new.exists' # No new classes/methods with a rating of C or worse allowed - 'elements.rating(<= C).new.exists' # No new classes/methods with a rating of C or worse allowed

View File

@ -9,8 +9,10 @@ php:
env: env:
matrix: matrix:
- EXECUTOR=coroutine - EXECUTOR= DEPENDENCIES=--prefer-lowest
- EXECUTOR=coroutine DEPENDENCIES=--prefer-lowest
- EXECUTOR= - EXECUTOR=
- EXECUTOR=coroutine
cache: cache:
@ -31,9 +33,8 @@ jobs:
include: include:
- stage: Test - stage: Test
env: DEPENDENCIES=low
install: install:
- travis_retry composer update --prefer-dist --prefer-lowest - travis_retry composer update --prefer-dist {$DEPENDENCIES}
- stage: Test - stage: Test
env: COVERAGE env: COVERAGE
@ -41,10 +42,12 @@ jobs:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,} - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
- if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
script: script:
- ./vendor/bin/phpunit --coverage-clover clover.xml - ./vendor/bin/phpunit --coverage-php /tmp/coverage/clover_executor.cov
- EXECUTOR=coroutine ./vendor/bin/phpunit --coverage-php /tmp/coverage/clover_executor-coroutine.cov
after_script: after_script:
- wget https://scrutinizer-ci.com/ocular.phar - ./vendor/bin/phpcov merge /tmp/coverage --clover /tmp/clover.xml
- php ocular.phar code-coverage:upload --format=php-clover clover.xml - wget https://github.com/scrutinizer-ci/ocular/releases/download/1.5.2/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover /tmp/clover.xml
- stage: Code Quality - stage: Code Quality
php: 7.1 php: 7.1
@ -58,3 +61,4 @@ jobs:
env: STATIC_ANALYSIS env: STATIC_ANALYSIS
install: travis_retry composer install --prefer-dist install: travis_retry composer install --prefer-dist
script: composer static-analysis script: composer static-analysis

View File

@ -19,6 +19,7 @@
"phpstan/phpstan": "0.10.5", "phpstan/phpstan": "0.10.5",
"phpstan/phpstan-phpunit": "0.10.0", "phpstan/phpstan-phpunit": "0.10.0",
"phpstan/phpstan-strict-rules": "0.10.1", "phpstan/phpstan-strict-rules": "0.10.1",
"phpunit/phpcov": "^5.0",
"phpunit/phpunit": "^7.2", "phpunit/phpunit": "^7.2",
"psr/http-message": "^1.0", "psr/http-message": "^1.0",
"react/promise": "2.*" "react/promise": "2.*"