summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Brahmer <info@b-brahmer.de>2019-03-28 16:03:37 +0100
committerSean Molenaar <SMillerDev@users.noreply.github.com>2019-03-29 10:42:57 +0100
commit373cc82f140fb4cb435185cf041af65184a6a0b1 (patch)
tree8f36199b0e5d2101f0f6e71540ae89c4ecb97c41
parentbb2abc82627d31a727b3d3e876c0edb4b975ff30 (diff)
remove coverage from integration run, upload to codecov
-rw-r--r--.travis.yml3
-rw-r--r--Makefile2
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index e9d388524..dd41bb601 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,9 @@ script:
after_failure:
- cat ../../data/nextcloud.log
+after_success:
+ - bash <(curl -s https://codecov.io/bash)
+
addons:
firefox: "latest-beta"
postgresql: "9.6"
diff --git a/Makefile b/Makefile
index 59e3c0acd..c25161d70 100644
--- a/Makefile
+++ b/Makefile
@@ -190,6 +190,6 @@ test:
cd js && $(npm) run test
./vendor/phpunit/phpunit/phpunit -c phpunit.xml --coverage-clover build/php-unit.clover
# \Test\TestCase is only allowed to access the db if TRAVIS environment variable is set
- env TRAVIS=1 ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml --coverage-clover build/php-unit.clover
+ env TRAVIS=1 ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
$(MAKE) phpcs
./bin/tools/generate_authors.php