ci: rework coveralls upload for unit tests with parallel+finish events; add config for coverage for integration tests; unify coverage paths & remove now obsolete clover script (#420)

martin-georgiev · web-flow · commit 342b4a01dd0e · 2025-08-18T23:13:10.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -113,13 +113,25 @@ jobs:
         run: composer audit
 
       - name: Run unit test suite
-        run: composer run-unit-tests-with-clover
+        run: composer run-unit-tests
 
       - name: Upload coverage results to Coveralls
         if: matrix.calculate-code-coverage == true
         uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          file: ./var/logs/test-coverage/unit/clover.xml
+          parallel: true
+          flag-name: "Unit"
           fail-on-error: false
-          base-path: ./var/logs/test-coverage/
-          flag-name: "PHP ${{ matrix.php }}"
+
+  coveralls-finish:
+    needs: tests
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Finalize Coveralls parallel run
+        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -8,9 +8,9 @@ build:
       tests:
         override:
           - php-scrutinizer-run
-          - command: composer run-unit-tests-with-clover
+          - command: composer run-unit-tests
             coverage:
-              file: var/logs/test-coverage/clover.xml
+              file: var/logs/test-coverage/unit/clover.xml
               format: clover
 
   dependencies:
diff --git a/ci/phpunit/config-integration.xml b/ci/phpunit/config-integration.xml
@@ -19,6 +19,12 @@
             <directory>../../tests/Integration</directory>
         </testsuite>
     </testsuites>
+    <coverage>
+        <report>
+            <html outputDirectory="../../var/logs/test-coverage/integration/html"/>
+            <clover outputFile="../../var/logs/test-coverage/integration/clover.xml"/>
+        </report>
+    </coverage>
     <source>
         <include>
             <directory suffix=".php">../../src</directory>
diff --git a/ci/phpunit/config-unit.xml b/ci/phpunit/config-unit.xml
@@ -21,8 +21,8 @@
     </testsuites>
     <coverage>
         <report>
-            <html outputDirectory="../../var/coverage/html"/>
-            <clover outputFile="../../var/coverage/clover.xml"/>
+            <html outputDirectory="../../var/logs/test-coverage/unit/html"/>
+            <clover outputFile="../../var/logs/test-coverage/unit/clover.xml"/>
         </report>
     </coverage>
     <source>
diff --git a/composer.json b/composer.json
@@ -102,9 +102,6 @@
         "run-unit-tests": [
             "@phpunit:unit"
         ],
-        "run-unit-tests-with-clover": [
-            "@phpunit:unit --coverage-clover=./var/logs/test-coverage/clover.xml"
-        ],
         "run-all-tests": [
             "@run-unit-tests",
             "@run-integration-tests"
