From 1bf8923d18b461d173775b10a1486c474b026a13 Mon Sep 17 00:00:00 2001 From: Piotr Synowiec Date: Thu, 28 Dec 2023 12:01:31 +0100 Subject: [PATCH 1/8] action-php-8.3: init --- .github/workflows/ci.yml | 16 ++-------------- phpunit.xml.dist8 => phpunit.xml.dist7 | 0 2 files changed, 2 insertions(+), 14 deletions(-) rename phpunit.xml.dist8 => phpunit.xml.dist7 (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6adf51e..25d67b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: self-hosted strategy: matrix: - php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ] + php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ] steps: - name: Setup PHP (PHP ${{ matrix.php }}) uses: shivammathur/setup-php@v2 @@ -32,7 +32,7 @@ jobs: run: composer install - name: Prepare PHPUnit config file for PHP < 8 - run: cp phpunit.xml.dist8 phpunit.xml.dist + run: cp phpunit.xml.dist7 phpunit.xml.dist if: "matrix.php < 8" - name: PHPUnit tests (PHP ${{ matrix.php }}) @@ -48,15 +48,3 @@ jobs: - name: Fix code coverage paths run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' var/coverage.xml - -# - name: Analyze with SonarQube -# uses: sonarsource/sonarqube-scan-action@master -# env: -# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} -# SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} -# # If you wish to fail your job when the Quality Gate is red, uncomment the -# # following lines. This would typically be used to fail a deployment. -# # - uses: sonarsource/sonarqube-quality-gate-action@master -# # timeout-minutes: 5 -# # env: -# # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/phpunit.xml.dist8 b/phpunit.xml.dist7 similarity index 100% rename from phpunit.xml.dist8 rename to phpunit.xml.dist7 From c1377d6a46a0213fe5a3c337bfe6bfe6f6d8fe2d Mon Sep 17 00:00:00 2001 From: Piotr Synowiec Date: Thu, 28 Dec 2023 12:08:57 +0100 Subject: [PATCH 2/8] action-php-8.3: update checkout action to v4 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25d67b3..19de872 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: coverage: xdebug tools: composer - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 From f248444bb4041593f2c0cf2a5ce50ea2a23a6b57 Mon Sep 17 00:00:00 2001 From: Piotr Synowiec Date: Thu, 28 Dec 2023 12:12:11 +0100 Subject: [PATCH 3/8] action-php-8.3: try php 8.4 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19de872..2ebde90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: self-hosted strategy: matrix: - php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] steps: - name: Setup PHP (PHP ${{ matrix.php }}) uses: shivammathur/setup-php@v2 From 0de3d296aa4e2b16a8f3e04539d3b2b006735c87 Mon Sep 17 00:00:00 2001 From: Piotr Synowiec Date: Thu, 28 Dec 2023 12:20:22 +0100 Subject: [PATCH 4/8] action-php-8.3: jit try --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ebde90..cdb31a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,8 @@ jobs: extensions: bcmath coverage: xdebug tools: composer + if: "matrix.php >= 8" + ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M - uses: actions/checkout@v4 with: From 5d098e8b52e527a91fcc2873fd5a6f3ff978fef8 Mon Sep 17 00:00:00 2001 From: Piotr Synowiec Date: Thu, 28 Dec 2023 12:21:27 +0100 Subject: [PATCH 5/8] action-php-8.3: update --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdb31a0..0e131b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,6 @@ jobs: extensions: bcmath coverage: xdebug tools: composer - if: "matrix.php >= 8" ini-values: opcache.enable_cli=1, opcache.jit=tracing, opcache.jit_buffer_size=64M - uses: actions/checkout@v4 From 865203fa498c4ca7fc2c726cae216abab04f0f04 Mon Sep 17 00:00:00 2001 From: Piotr Synowiec Date: Thu, 28 Dec 2023 12:43:55 +0100 Subject: [PATCH 6/8] action-php-8.3: added text test coverage --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e131b1..9e8b2af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,8 +44,11 @@ jobs: - name: Coding standard (PHP ${{ matrix.php }}) run: php${{ matrix.php }} ./vendor/bin/ecs check src tests - - name: Code coverage + - name: Code coverage - clover run: php${{ matrix.php }} -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-clover=var/coverage.xml + - name: Code coverage - text + run: php${{ matrix.php }} -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-text + - name: Fix code coverage paths run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' var/coverage.xml From ed72860d1343fc906a078ff4676143c2643c415c Mon Sep 17 00:00:00 2001 From: Piotr Synowiec Date: Thu, 28 Dec 2023 12:45:40 +0100 Subject: [PATCH 7/8] action-php-8.3: update code coverage --- .github/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e8b2af..f580b49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,10 +44,7 @@ jobs: - name: Coding standard (PHP ${{ matrix.php }}) run: php${{ matrix.php }} ./vendor/bin/ecs check src tests - - name: Code coverage - clover - run: php${{ matrix.php }} -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-clover=var/coverage.xml - - - name: Code coverage - text + - name: Code coverage run: php${{ matrix.php }} -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-text - name: Fix code coverage paths From 0cf9ad6b943b9b1a5e1554741969357c88ca2604 Mon Sep 17 00:00:00 2001 From: Piotr Synowiec Date: Thu, 28 Dec 2023 12:57:07 +0100 Subject: [PATCH 8/8] action-php-8.3: tweaking code coverage --- .github/workflows/ci.yml | 2 +- phpunit.xml.dist | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f580b49..2ccba4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: run: php${{ matrix.php }} ./vendor/bin/ecs check src tests - name: Code coverage - run: php${{ matrix.php }} -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-text + run: php${{ matrix.php }} -d xdebug.mode=coverage ./vendor/bin/phpunit - name: Fix code coverage paths run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' var/coverage.xml diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6a9b19a..8a236d3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -17,6 +17,7 @@ +