From c8dd8d93c17062f5fcbe56a9e66a3a156986e483 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Tue, 31 Mar 2020 16:10:19 +0200
Subject: [PATCH] fix working directory of codecov

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
---
 .github/workflows/php-test.yml                 |  8 ++------
 composer.json                                  |  2 +-
 tests/php/phpunit.unit.xml => phpunit.unit.xml | 16 ++++++++--------
 3 files changed, 11 insertions(+), 15 deletions(-)
 rename tests/php/phpunit.unit.xml => phpunit.unit.xml (52%)

diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml
index c384da202..d6fa82dbb 100644
--- a/.github/workflows/php-test.yml
+++ b/.github/workflows/php-test.yml
@@ -39,9 +39,5 @@ jobs:
       working-directory: nextcloud/apps/calendar
       run: composer run test
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./nextcloud/apps/calendar/tests/php/clover.unit.xml
-        flags: php
-        fail_ci_if_error: true
+      working-directory: nextcloud/apps/calendar
+      run: curl -s https://codecov.io/bash | bash -s - -t ${{ secrets.CODECOV_TOKEN }} -F php -f clover.unit.xml -Z
diff --git a/composer.json b/composer.json
index d8f723aab..60496d190 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,6 @@
     "scripts": {
         "lint": "find . -name \\*.php -not -path './vendor/*' -exec php -l \"{}\" \\;",
         "phan": "phan --allow-polyfill-parser -k .phan/config.php",
-        "test": "phpunit --configuration tests/php/phpunit.unit.xml --fail-on-warning"
+        "test": "phpunit --configuration phpunit.unit.xml --fail-on-warning"
     }
 }
diff --git a/tests/php/phpunit.unit.xml b/phpunit.unit.xml
similarity index 52%
rename from tests/php/phpunit.unit.xml
rename to phpunit.unit.xml
index fc90e7e80..bda6ea4d3 100644
--- a/tests/php/phpunit.unit.xml
+++ b/phpunit.unit.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="unit/bootstrap.php"
+<phpunit bootstrap="tests/php/unit/bootstrap.php"
          verbose="true"
          timeoutForSmallTests="900"
          timeoutForMediumTests="900"
          timeoutForLargeTests="900"
 >
     <testsuite name='Calendar app tests'>
-        <directory suffix='test.php'>unit</directory>
-        <directory suffix='Test.php'>unit</directory>
+        <directory suffix='test.php'>./tests/php/unit</directory>
+        <directory suffix='Test.php'>./tests/php/unit</directory>
     </testsuite>
     <!-- filters for code coverage -->
     <filter>
         <whitelist>
-            <directory suffix=".php">../../</directory>
+            <directory suffix=".php">./</directory>
             <exclude>
-                <directory suffix=".php">../calendar/appinfo</directory>
-                <directory suffix=".php">../calendar/l10n</directory>
-                <directory suffix=".php">../calendar/templates</directory>
-                <directory suffix=".php">../calendar/tests</directory>
+                <directory suffix=".php">./appinfo</directory>
+                <directory suffix=".php">./l10n</directory>
+                <directory suffix=".php">./templates</directory>
+                <directory suffix=".php">./tests</directory>
             </exclude>
         </whitelist>
     </filter>