From 63f392131a509080e5a133ff4aaad7373adfb2dc Mon Sep 17 00:00:00 2001 From: "Olivier Paroz (oparoz)" Date: Sun, 12 Mar 2017 11:57:47 +0100 Subject: [PATCH] Use Codecov exclusively for coverage + some doc fixes Signed-off-by: Olivier Paroz (oparoz) --- .scrutinizer.yml | 2 -- .travis.yml | 8 +++----- README.md | 2 +- build/documentation/docpublisher.sh | 4 ++-- documentation/developers.md | 6 +++--- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 301248af..7df8670a 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -24,8 +24,6 @@ tools: php_sim: true php_pdepend: true php_analyzer: true - external_code_coverage: - timeout: 3600 # Timeout in seconds. 60 minutes checks: php: diff --git a/.travis.yml b/.travis.yml index 95129d9e..75a1ac17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,7 +96,7 @@ before_script: - cd ${TRAVIS_BUILD_DIR}/../${SERVER_FOLDER}/apps/$APP_NAME - composer self-update - composer install -o --prefer-dist --no-interaction - - composer show -i + - composer show script: # Test lint @@ -114,10 +114,8 @@ script: # - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$DB' = 'mysql' ]; then phpenv config-rm xdebug.ini; phpdbg -qrr vendor/bin/codecept run unit,integration,api --coverage --coverage-xml --coverage-html; fi;" after_success: - # Send coverage report to Scrutinizer - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$DB' = 'mysql' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi" - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$DB' = 'mysql' ]; then php ocular.phar code-coverage:upload --format=php-clover tests/_output/coverage.xml; fi" - - bash <(curl -s https://codecov.io/bash) -f tests/_output/coverage.xml + # Send coverage report to Codecov + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$DB' = 'mysql' ]; then bash <(curl -s https://codecov.io/bash) -f tests/_output/coverage.xml; fi" # Generate API documentation - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7.0' ] && [ '$DB' = 'mysql' ]; then php vendor/bin/phpdoc run; fi" diff --git a/README.md b/README.md index 418ba8bc..874def0f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Gallery [![Build Status](https://travis-ci.org/nextcloud/gallery.svg?branch=master)](https://travis-ci.org/nextcloud/gallery) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/gallery/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/gallery/?branch=master) -[![Code Coverage](https://scrutinizer-ci.com/g/nextcloud/gallery/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/gallery/?branch=master) +[![Code Coverage](https://codecov.io/gh/nextcloud/gallery/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/gallery) [![PHP 7 ready](http://php7ready.timesplinter.ch/nextcloud/gallery/badge.svg)](https://travis-ci.org/nextcloud/gallery) Media gallery for Nextcloud which includes previews for all media types supported by your installation. diff --git a/build/documentation/docpublisher.sh b/build/documentation/docpublisher.sh index c3adcd6e..39f14872 100644 --- a/build/documentation/docpublisher.sh +++ b/build/documentation/docpublisher.sh @@ -14,7 +14,7 @@ git init # Inside this git repo we'll pretend to be a new user git config user.name "Travis CI" -git config user.email "travis-gallery-reporter@interfasys.ch" +git config user.email "travis-gallery-reporter@nextcloud.com" # The first and only commit to this new Git repo contains all the # files present with the commit message "Deploy to GitHub Pages". @@ -23,7 +23,7 @@ git add . # Initialising wiki submodule git submodule add https://github.com/nextcloud/gallery.wiki.git wiki -git commit -m "Gallery documentation" +git commit -m "Nextcloud Gallery documentation" # Force push from the current repo's master branch to the remote # repo's gh-pages branch. (All previous history on the gh-pages branch diff --git a/documentation/developers.md b/documentation/developers.md index d0ee00ef..0c94d91f 100644 --- a/documentation/developers.md +++ b/documentation/developers.md @@ -1,4 +1,4 @@ -## Developer documentation for ownCloud Gallery +## Developer documentation for Nextcloud Gallery -* [API documentation and reports](https://owncloud.github.io/gallery/) -* [Developer documentation](https://github.com/owncloud/gallery/wiki) +* [API documentation and reports](https://nextcloud.github.io/gallery/) +* [Developer documentation](https://github.com/nextcloud/gallery/wiki)