Fix

Author: yoanm

.github/workflows/CI.yml

@@ -40,7 +40,7 @@ jobs:
         uses: docker://webfactory/composer-require-checker:3.2.0
 
   tests:
-    name: Tests / PHP ${{ matrix.php-version }}
+    name: Tests / PHP ${{ matrix.php-version }} / Symfony ${{ matrix.symfony-version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -89,23 +89,23 @@ jobs:
             symfony/routing:^${{ matrix.symfony-version }} \
           && make build
 
-      - name: Test
+      - name: Tests
         run: make test-unit && make test-functional
 
       # See the reports at https://codecov.io/gh/yoanm/symfony-jsonrpc-http-server
       - name: Upload unit tests coverage to codecov
         uses: codecov/codecov-action@v2
         with:
-          file: "build/coverage/clover-unit.xml"
+          file: "build/coverage-phpunit/clover-unit.xml"
           name: "unit-tests-${{ matrix.php-version }}-${{ matrix.symfony-version }}"
-          flags: "unit-tests,php-${{ matrix.php-version }},sf-^${{ matrix.symfony-version }}"
+          flags: "unit-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}+"
           fail_ci_if_error: true
-      - name: Upload unit tests coverage to codecov
+          move_coverage_to_trash: true
+      - name: Upload functional tests coverage to codecov
         uses: codecov/codecov-action@v2
         with:
-          file: "build/coverage/clover-functional.xml,build/behat-coverage/clover.xml"
           name: "functional-tests-${{ matrix.php-version }}-${{ matrix.symfony-version }}"
-          flags: "functional-tests,php-${{ matrix.php-version }},sf-^${{ matrix.symfony-version }}"
+          flags: "functional-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}+"
           fail_ci_if_error: true
 
   nightly-tests:
@@ -138,6 +138,7 @@ jobs:
           update: true
 
       - name: Setup cache
+        continue-on-error: true
         id: cache
         uses: actions/cache@v2
         with:
@@ -148,6 +149,7 @@ jobs:
           key: ${{ env.CACHE_VERSION }}-tests-${{ matrix.php-version }}-${{ matrix.symfony-version }}-${{ hashFiles('composer.json') }}
 
       - name: Build
+        continue-on-error: true
         run: |
           composer require \
             symfony/http-foundation:^${{ matrix.symfony-version }} \
@@ -159,20 +161,23 @@ jobs:
           && make build
 
       - name: Test
+        continue-on-error: true
         run: make test-unit && make test-functional
 
       # See the reports at https://codecov.io/gh/yoanm/symfony-jsonrpc-http-server
       - name: Upload unit tests coverage to codecov
         uses: codecov/codecov-action@v2
+        continue-on-error: true
         with:
-          file: "build/coverage/clover-unit.xml"
+          file: "build/coverage-phpunit/clover-unit.xml"
           name: "unit-tests-${{ matrix.php-version }}-${{ matrix.symfony-version }}"
-          flags: "unit-tests,php-${{ matrix.php-version }},sf-^${{ matrix.symfony-version }}"
+          flags: "nightly,unit-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}+"
           fail_ci_if_error: false
-      - name: Upload unit tests coverage to codecov
+          move_coverage_to_trash: true
+      - name: Upload functional tests coverage to codecov
         uses: codecov/codecov-action@v2
-        with:
-          file: "build/coverage/clover-functional.xml,build/behat-coverage/clover.xml"
+        continue-on-error: true
+          file: "build/coverage-phpunit/clover-functional.xml,build/coverage-behat/clover.xml"
           name: "functional-tests-${{ matrix.php-version }}-${{ matrix.symfony-version }}"
-          flags: "functional-tests,php-${{ matrix.php-version }},sf-^${{ matrix.symfony-version }}"
+          flags: "nightly,functional-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}+"
           fail_ci_if_error: false

Makefile

@@ -3,11 +3,11 @@ TEST_OUTPUT_STYLE ?= dot
 
 ## DIRECTORY AND FILE
 BUILD_DIRECTORY ?= build
-REPORTS_DIRECTORY ?= ${BUILD_DIRECTORY}/reports
-COVERAGE_DIRECTORY ?= ${BUILD_DIRECTORY}/coverage
+REPORTS_DIRECTORY ?= ${BUILD_DIRECTORY}/reports # Codestyle
 BEHAT_COVERAGE_DIRECTORY ?= ${BUILD_DIRECTORY}/coverage-behat
-PHPUNIT_UNIT_COVERAGE_FILE_PATH ?= ${COVERAGE_DIRECTORY}/clover-unit.xml
-PHPUNIT_FUNCTIONAL_COVERAGE_FILE_PATH ?= ${COVERAGE_DIRECTORY}/clover-functional.xml
+PHPUNIT_COVERAGE_DIRECTORY ?= ${BUILD_DIRECTORY}/coverage-phpunit
+PHPUNIT_UNIT_COVERAGE_FILE_PATH ?= ${PHPUNIT_COVERAGE_DIRECTORY}/clover-unit.xml
+PHPUNIT_FUNCTIONAL_COVERAGE_FILE_PATH ?= ${PHPUNIT_COVERAGE_DIRECTORY}/clover-functional.xml
 
 ## Commands options
 ### Composer
@@ -42,8 +42,8 @@ endif
 ifdef COVERAGE_OUTPUT_STYLE
 	export XDEBUG_MODE=coverage
 	ifeq ("${COVERAGE_OUTPUT_STYLE}","html")
-		PHPUNIT_COVERAGE_OPTION ?= --coverage-html ${COVERAGE_DIRECTORY}
-		PHPUNIT_FUNCTIONAL_COVERAGE_OPTION ?= --coverage-html ${COVERAGE_DIRECTORY}
+		PHPUNIT_COVERAGE_OPTION ?= --coverage-html ${PHPUNIT_COVERAGE_DIRECTORY}
+		PHPUNIT_FUNCTIONAL_COVERAGE_OPTION ?= --coverage-html ${PHPUNIT_COVERAGE_DIRECTORY}
 		BEHAT_COVERAGE_OPTION ?= --profile coverage-html
 	else ifeq ("${COVERAGE_OUTPUT_STYLE}","clover")
 		PHPUNIT_COVERAGE_OPTION ?= --coverage-clover ${PHPUNIT_UNIT_COVERAGE_FILE_PATH}
@@ -107,7 +107,7 @@ scrutinizer-behat:
 
 # Internal commands
 create-build-directories:
-	mkdir -p ${COVERAGE_DIRECTORY} ${BEHAT_COVERAGE_DIRECTORY} ${REPORTS_DIRECTORY} ${REPORTS_DIRECTORY}
+	mkdir -p ${PHPUNIT_COVERAGE_DIRECTORY} ${BEHAT_COVERAGE_DIRECTORY} ${REPORTS_DIRECTORY}
 
 .PHONY: build install configure test test-unit test-functional codestyle create-build-directories scrutinizer-behat scrutinizer-phpunit
 .DEFAULT: build