From 7349353bc4c5db248214dd4a7940f27457fb4b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Jun 2020 09:17:59 +0200 Subject: [PATCH 1/2] Use CodeCov instead of Scrutinizer --- .scrutinizer.yml | 36 ------------------------------------ .travis.yml | 5 ++--- README.md | 2 +- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 .scrutinizer.yml diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index bb263d09..00000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,36 +0,0 @@ -before_commands: - - "composer update --prefer-source" - -tools: - external_code_coverage: true - php_code_coverage: true - php_code_sniffer: - enabled: true - config: - standard: PSR2 - filter: - paths: ["src/*", "tests/*"] - php_cpd: - enabled: true - excluded_dirs: ["build", "docs", "tests", "vendor"] - php_cs_fixer: - enabled: true - config: - level: all - filter: - paths: ["src/*", "tests/*"] - php_loc: - enabled: true - excluded_dirs: ["build", "docs", "tests", "vendor"] - php_mess_detector: - enabled: true - filter: - paths: ["src/*"] - php_pdepend: - enabled: true - excluded_dirs: ["build", "docs", "tests", "vendor"] - php_analyzer: true - php_analyzer: - filter: - paths: ["src/*", "tests/*"] - sensiolabs_security_checker: true diff --git a/.travis.yml b/.travis.yml index 28a58b9f..83306ded 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,5 @@ script: - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi - if [[ $TEST_COVERAGE == 'true' ]]; then php build/coverage-checker.php build/clover.xml 70 ; fi -after_script: - - if [[ $TEST_COVERAGE == 'true' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi - - if [[ $TEST_COVERAGE == 'true' ]]; then php ocular.phar code-coverage:upload --format=php-clover ./build/clover.xml; fi +after_success: + - if [[ $TEST_COVERAGE == 'true' ]]; then bash <(curl -s https://codecov.io/bash) -f ./build/clover.xml; fi diff --git a/README.md b/README.md index 262c77b0..65937c0e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # DoctrineModule for Laminas -[![Master Branch Build Status](https://secure.travis-ci.org/doctrine/DoctrineModule.png?branch=master)](http://travis-ci.org/doctrine/DoctrineModule) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/doctrine/DoctrineModule/badges/quality-score.png?s=9772884307bfc08a7eae862fd553e9d5df251729)](https://scrutinizer-ci.com/g/doctrine/DoctrineModule/) [![Code Coverage](https://scrutinizer-ci.com/g/doctrine/DoctrineModule/badges/coverage.png?s=3a35b83cbfdb95b54fd01fd1aef6b0c65a09a43b)](https://scrutinizer-ci.com/g/doctrine/DoctrineModule/) +[![Master Branch Build Status](https://secure.travis-ci.org/doctrine/DoctrineModule.png?branch=master)](http://travis-ci.org/doctrine/DoctrineModule) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/doctrine/DoctrineModule/badges/quality-score.png?s=9772884307bfc08a7eae862fd553e9d5df251729)](https://scrutinizer-ci.com/g/doctrine/DoctrineModule/) [![Code Coverage](https://codecov.io/gh/doctrine/DoctrineModule/branch/master)](https://codecov.io/gh/doctrine/DoctrineModule/branch/master) DoctrineModule provides basic functionality consumed by [DoctrineORMModule](http://www.github.com/doctrine/DoctrineORMModule) From 4439d47c5b4c1396e862bd482aa8ad1e7b861094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Jun 2020 09:25:02 +0200 Subject: [PATCH 2/2] Use up-to-date github actions --- .github/workflows/continuous-integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 14fbe06e..236d4e6c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,10 +21,10 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2.0.0" + uses: "actions/checkout@v2" - name: "Install PHP" - uses: "shivammathur/setup-php@1.8.1" + uses: "shivammathur/setup-php@v2" with: coverage: "none" php-version: "${{ matrix.php-version }}"