Update coverage path

pulkitjalan · Oct 7, 2020 · c59311d · c59311d
1 parent a0b14fe
commit c59311d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 28 deletions.
diff --git a/.github/workflows/run-tests-L7.yml b/.github/workflows/run-tests-L7.yml
@@ -38,9 +38,9 @@ jobs:
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
-        run: vendor/bin/phpunit --coverage-xml ./ tests
+        run: vendor/bin/phpunit tests
 
       - uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: coverage.xml
+          file: build/coverage.xml
diff --git a/.github/workflows/run-tests-L8.yml b/.github/workflows/run-tests-L8.yml
@@ -38,9 +38,9 @@ jobs:
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
-        run: vendor/bin/phpunit --coverage-xml ./ tests
+        run: vendor/bin/phpunit tests
 
       - uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: coverage.xml
+          file: build/coverage.xml
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="vendor/autoload.php"
+<phpunit bootstrap="vendor/autoload.php"
          backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
@@ -9,26 +8,29 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-    <exclude>
-      <file>src/GeoIPServiceProvider.php</file>
-      <directory suffix=".php">src/config/</directory>
-      <directory suffix=".php">src/Facades/</directory>
-      <directory suffix=".php">src/Console/</directory>
-    </exclude>
-  </coverage>
-  <testsuites>
-    <testsuite name="GeoIP Test Suite">
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-  <php>
-    <env name="CACHE_DRIVER" value="array"/>
-  </php>
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="GeoIP Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
+            <exclude>
+                <file>src/GeoIPServiceProvider.php</file>
+                <directory suffix=".php">src/config/</directory>
+                <directory suffix=".php">src/Facades/</directory>
+                <directory suffix=".php">src/Console/</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="tap" target="build/report.tap"/>
+        <log type="junit" target="build/report.junit.xml"/>
+        <log type="coverage-html" target="build/coverage"/>
+        <log type="coverage-text" target="build/coverage.txt"/>
+        <log type="coverage-xml" target="build/coverage.xml"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
 </phpunit>