From 0050ebd3ae74f43996be3f9d53cfa93e0cf09b3a Mon Sep 17 00:00:00 2001 From: Don Koopa Date: Tue, 13 Sep 2016 22:22:39 +0200 Subject: [PATCH 1/3] Add .coveralls.yml --- .coveralls.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..bc71b62 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1,2 @@ +coverage_clover: clover.xml +json_path: coveralls-upload.json From 5cb70293c1808dacae079335963c4c70a4a5c1bb Mon Sep 17 00:00:00 2001 From: Don Koopa Date: Tue, 13 Sep 2016 22:26:35 +0200 Subject: [PATCH 2/3] Move env variables So all other repo's .travis.yml have them in the same place --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 304dbf2..34b18cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,10 @@ cache: env: global: - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs" + - SITE_URL=https://zendframework.github.io/zend-mvc-plugin-fileprg + - GH_USER_NAME="Matthew Weier O'Phinney" + - GH_USER_EMAIL=matthew@weierophinney.net + - GH_REF=github.com/zendframework/zend-mvc-plugin-fileprg.git - secure: "onTs0dEukjobvBFGPub4RppiwDdlSQGJbdbSE942w17J0JxCTm3JejKLd3Y/FDBflNks6V9vN0StLPrdyQc+qB0fhf3OAbJ/vdjrp0RNveeo+GBfGiXDKIdgLgDE1wWolAgSfadT+rOxyn9px4JDrmRin8T7LGIR3OZAt/ptfkM1GGDY2Heac95htsqLpjcLG9Pyw3cHbB6uiCoj3bD2+/pKB+ktXOKUQgCJVWIAF5Qf8IKJoiVl9oNwKnGJrQICe2EaXRsnI3c1fu5BivduklxuSSjVCLYzFddLPJSBiTNRfxnD/kONt3J0IOcUGFjFVXijTcsbAxzMBAsEDPe9tCuKYYNGZF63ZdtmY6PyY6dNsyZ2pHsuda8hpV+H4j1jQBcoXbwulsp3IaiWwq9ChL5Ysdf1VnqwJAxE2GQj4BbtFEVvaEFc3dV05XnWJKD9oTGoS/D6pkC33Wnp04gWpvv0tOgpybyqdIRbYbx9Ke7XU1VY1C5p7rIe8CfGY6lGeI9Cop5RCD+6ukAEMxtO9MWGV4FVWLd329CW+oGO4qNte/vuVpwBgdhsN/eXjIrpGb8RFnXg8EWr8H4ES6sy8uLG0lNWfkYQp+rjKIi6f5eXXGvuTvdjGi5moSCNfQCVgT3PUFphiiQUVvtuZbdW3Rk3wQMw8QCI/+EnTTuBi6g=" matrix: @@ -30,10 +34,6 @@ matrix: - TEST_COVERAGE=true - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)" - PATH="$HOME/.local/bin:$PATH" - - SITE_URL=https://zendframework.github.io/zend-mvc-plugin-fileprg - - GH_USER_NAME="Matthew Weier O'Phinney" - - GH_USER_EMAIL=matthew@weierophinney.net - - GH_REF=github.com/zendframework/zend-mvc-plugin-fileprg.git - php: 5.6 env: - DEPS=latest From 9f2acbf047822f155042b17f2b25148f820c2b4a Mon Sep 17 00:00:00 2001 From: Don Koopa Date: Tue, 13 Sep 2016 22:27:28 +0200 Subject: [PATCH 3/3] Move Coverage reporting to latest env Requiring php-coveralls results in a full update of all dependencies instead of composer installing the versions mentioned in the composer.lock Remove --no-update flag to enable installation and use a stable version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34b18cb..530564e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,12 +31,12 @@ matrix: - php: 5.6 env: - DEPS=locked - - TEST_COVERAGE=true - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)" - PATH="$HOME/.local/bin:$PATH" - php: 5.6 env: - DEPS=latest + - TEST_COVERAGE=true - php: 7 env: - DEPS=lowest @@ -70,7 +70,7 @@ before_install: install: - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi - - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --no-update --dev $COMPOSER_ARGS satooshi/php-coveralls ; fi + - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi - travis_retry composer install $COMPOSER_ARGS - composer show --installed