diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 4651737..0708e19 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -65,17 +65,15 @@ jobs: - name: PHPUnit & coverage working-directory: apps/${{ env.APP_NAME }} - run: ./vendor/phpunit/phpunit/phpunit --coverage-clover clover.xml -c phpunit.xml + run: ./vendor/phpunit/phpunit/phpunit --coverage-clover coverage.xml -c phpunit.xml - name: PHPUnit integration working-directory: apps/${{ env.APP_NAME }} run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml - - name: Generate coverage + - name: Upload coverage working-directory: apps/${{ env.APP_NAME }} - run: | - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover clover.xml + run: bash <(curl -s https://codecov.io/bash) mysql: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index b698265..f5ff2ee 100644 --- a/Makefile +++ b/Makefile @@ -127,5 +127,5 @@ appstore: clean lint build-js-production .PHONY: test test: composer - $(CURDIR)/vendor/phpunit/phpunit/phpunit --coverage-clover clover.xml -c phpunit.xml + $(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml $(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml