From e2edeaca2bd92585e24fc49c05f55f318a4d8bb6 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 9 Jun 2021 20:45:59 +0200 Subject: [PATCH 1/4] try a php coverage report script --- .github/workflows/test.yml | 6 ++++-- community_server/Dockerfile | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2bd99e045..f7a9a22bd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -335,12 +335,14 @@ jobs: ######################################################################### # COVERAGE CHECK BACKEND COMMUNITY-SERVER #################################### ########################################################################## - #- name: backend community simplecov | Coverage check + - name: backend community simplecov | Coverage check + run: | + docker run -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test vendor/bin/coverage-check ./webroot/coverage/clover.xml 5 # uses: webcraftmedia/coverage-check-action@master # with: # report_name: Coverage Backend # type: simplecov - # result_path: ./coverage/coverage.info + # result_path: ./coverage/clover.xml # min_coverage: 8 # token: ${{ github.token }} diff --git a/community_server/Dockerfile b/community_server/Dockerfile index eabb37741..596c4c98d 100644 --- a/community_server/Dockerfile +++ b/community_server/Dockerfile @@ -21,9 +21,9 @@ RUN apt-get update \ && apt-get -y --no-install-recommends install php7.4-xdebug \ && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* -WORKDIR /var/www/cakephp + ENV XDEBUG_MODE=coverage +RUN composer require --dev rregeer/phpunit-coverage-check -CMD ./vendor/bin/phpunit --coverage-text=./webroot/coverage/coverage.info - +CMD ./vendor/bin/phpunit --coverage-clover=./webroot/coverage/clover.xml From bea597268fc1acc3d34dbf591cab92311a4eb9c3 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 9 Jun 2021 21:02:19 +0200 Subject: [PATCH 2/4] update name and target coverage --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 774467922..4f3d6a28c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -268,7 +268,7 @@ jobs: report_name: Coverage Backend type: lcov result_path: ./coverage/coverage.info - min_coverage: 6 + min_coverage: 13 token: ${{ github.token }} ############################################################################## @@ -335,9 +335,9 @@ jobs: ######################################################################### # COVERAGE CHECK BACKEND COMMUNITY-SERVER #################################### ########################################################################## - - name: backend community simplecov | Coverage check + - name: backend community | Coverage check run: | - docker run -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test vendor/bin/coverage-check ./webroot/coverage/clover.xml 5 + docker run -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test vendor/bin/coverage-check ./webroot/coverage/clover.xml 14 # uses: webcraftmedia/coverage-check-action@master # with: # report_name: Coverage Backend From 5b3e2fdda7caf87cc9098794bb640418bf22ce89 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 11 Jun 2021 16:53:00 +0200 Subject: [PATCH 3/4] try coverage action from me modified --- .github/workflows/test.yml | 18 +++++++++--------- community_server/Dockerfile | 5 +++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4f3d6a28c..1d7a382e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -336,15 +336,15 @@ jobs: # COVERAGE CHECK BACKEND COMMUNITY-SERVER #################################### ########################################################################## - name: backend community | Coverage check - run: | - docker run -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test vendor/bin/coverage-check ./webroot/coverage/clover.xml 14 - # uses: webcraftmedia/coverage-check-action@master - # with: - # report_name: Coverage Backend - # type: simplecov - # result_path: ./coverage/clover.xml - # min_coverage: 8 - # token: ${{ github.token }} + #run: | + # docker run -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test vendor/bin/coverage-check ./webroot/coverage/clover.xml 14 + uses: einhornimmond/coverage-check-action@master + with: + report_name: Coverage Backend + type: phpunit + result_path: ./coverage/coverage.info + min_coverage: 10 + token: ${{ github.token }} #test: # runs-on: ubuntu-latest diff --git a/community_server/Dockerfile b/community_server/Dockerfile index 596c4c98d..c553137c6 100644 --- a/community_server/Dockerfile +++ b/community_server/Dockerfile @@ -23,7 +23,8 @@ RUN apt-get update \ ENV XDEBUG_MODE=coverage -RUN composer require --dev rregeer/phpunit-coverage-check +#RUN composer require --dev rregeer/phpunit-coverage-check -CMD ./vendor/bin/phpunit --coverage-clover=./webroot/coverage/clover.xml +#CMD ./vendor/bin/phpunit --coverage-clover=./webroot/coverage/clover.xml +CMD ./vendor/bin/phpunit --coverage-text=./webroot/coverage/coverage.info From 3e71d5423cbede3ed7bb52f6bf0534340886d2fb Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 11 Jun 2021 17:18:26 +0200 Subject: [PATCH 4/4] make coverage report names unique --- .github/workflows/test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d7a382e3..076453d9e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -265,7 +265,7 @@ jobs: - name: backend login | Coverage check uses: webcraftmedia/coverage-check-action@master with: - report_name: Coverage Backend + report_name: Coverage Backend Login type: lcov result_path: ./coverage/coverage.info min_coverage: 13 @@ -336,11 +336,9 @@ jobs: # COVERAGE CHECK BACKEND COMMUNITY-SERVER #################################### ########################################################################## - name: backend community | Coverage check - #run: | - # docker run -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test vendor/bin/coverage-check ./webroot/coverage/clover.xml 14 uses: einhornimmond/coverage-check-action@master with: - report_name: Coverage Backend + report_name: Coverage Backend Community type: phpunit result_path: ./coverage/coverage.info min_coverage: 10