Skip to content

fix: collect coverage only from php8.3 tests #2447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norberttech merged 1 commit into from
Jun 12, 2026
Merged

fix: collect coverage only from php8.3 tests #2447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .codecov.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
codecov:
notify:
after_n_builds: 3
after_n_builds: 1

comment:
layout: "condensed_header, diff, components"
after_n_builds: 3
after_n_builds: 1

flag_management:
default_rules:
Expand All @@ -16,6 +16,8 @@ flag_management:
carryforward: true
- name: arrow-extension
carryforward: true
- name: telemetry-tests
carryforward: true

component_management:
individual_components:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job-arrow-extension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
dependencies: locked

- name: Run Parquet Integration Tests with Arrow
run: just test --testsuite=lib-parquet-integration
run: just test --testsuite=lib-parquet-integration ${{ (matrix.php == '8.3' && matrix.os == 'ubuntu-latest') && '--coverage-clover=./var/phpunit/coverage/clover/coverage.xml' || '' }}

- name: Upload to Codecov
if: ${{ !cancelled() && matrix.php == '8.3' && matrix.os == 'ubuntu-latest' }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/job-extension-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ jobs:
cache-key-suffix: "-extensions"

- name: "Test Brotli"
run: "just test --group brotli-extension"
run: "just test --group brotli-extension ${{ matrix.php-version == '8.3' && '--coverage-clover=./var/phpunit/coverage/clover/brotli.xml' || '' }}"

- name: "Test LZ4"
run: "just test --group lz4-extension"
run: "just test --group lz4-extension ${{ matrix.php-version == '8.3' && '--coverage-clover=./var/phpunit/coverage/clover/lz4.xml' || '' }}"

- name: "Test ZSTD"
run: "just test --group zstd-extension"
run: "just test --group zstd-extension ${{ matrix.php-version == '8.3' && '--coverage-clover=./var/phpunit/coverage/clover/zstd.xml' || '' }}"

- name: "Test Snappy"
run: "just test --group snappy-extension"
run: "just test --group snappy-extension ${{ matrix.php-version == '8.3' && '--coverage-clover=./var/phpunit/coverage/clover/snappy.xml' || '' }}"

- name: Upload to Codecov
if: ${{ !cancelled() && matrix.php-version == '8.3' }}
Expand Down
16 changes: 14 additions & 2 deletions .github/workflows/job-phpunit-telemetry-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: PHPUnit Telemetry Bridge Tests

on:
workflow_call:
secrets:
CODECOV_TOKEN:
required: false

permissions:
contents: read
Expand Down Expand Up @@ -47,6 +50,7 @@ jobs:
with:
php-version: "${{ matrix.php-version }}"
dependencies: "locked"
coverage: ${{ matrix.php-version == '8.3' && 'pcov' || 'none' }}
extensions: ':psr, bcmath, dom, hash, json, mbstring, xml, xmlwriter, xmlreader, zlib, curl, pgsql, grpc, protobuf'
ini-values: 'memory_limit=-1'
apt-packages: "build-essential autoconf automake libtool protobuf-compiler libprotobuf-c-dev"
Expand All @@ -62,6 +66,14 @@ jobs:
run: tools/phpunit/vendor/bin/phpunit --version

- name: "Test"
run: just test --testsuite bridge-phpunit-postgresql-unit,bridge-phpunit-postgresql-integration,bridge-phpunit-telemetry-unit
run: just test --testsuite bridge-phpunit-postgresql-unit,bridge-phpunit-postgresql-integration,bridge-phpunit-telemetry-unit ${{ matrix.php-version == '8.3' && '--coverage-clover=./var/phpunit/coverage/clover/coverage.xml' || '' }}
env:
PGSQL_DATABASE_URL: pgsql://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports['5432'] }}/postgres?serverVersion=11&charset=utf8
PGSQL_DATABASE_URL: pgsql://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports['5432'] }}/postgres?serverVersion=18&charset=utf8

- name: Upload to Codecov
if: ${{ !cancelled() && matrix.php-version == '8.3' && matrix.phpunit-version == '11' }}
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v6
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./var/phpunit/coverage/clover
flags: telemetry-tests
6 changes: 3 additions & 3 deletions .github/workflows/job-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
timeout-minutes: 15
run: "just test --exclude-group grpc --log-junit ./var/phpunit/logs/junit.xml ${{ matrix.php-version == '8.3' && '--coverage-clover=./var/phpunit/coverage/clover/coverage.xml' || '' }}"
env:
PGSQL_DATABASE_URL: pgsql://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports['5432'] }}/postgres?serverVersion=11&charset=utf8
PGSQL_DATABASE_URL: pgsql://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports['5432'] }}/postgres?serverVersion=18&charset=utf8
MYSQL_DATABASE_URL: mysql://mysql:mysql@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/mysql
SQLITE_DATABASE_URL: "sqlite:///:memory:"
AZURITE_HOST: "localhost"
Expand All @@ -152,9 +152,9 @@ jobs:
- name: "Test (grpc)"
timeout-minutes: 10
continue-on-error: ${{ matrix.php-version == '8.5' }}
run: "just test --group grpc --log-junit ./var/phpunit/logs/grpc-junit.xml"
run: "just test --group grpc --log-junit ./var/phpunit/logs/grpc-junit.xml ${{ matrix.php-version == '8.3' && '--coverage-clover=./var/phpunit/coverage/clover/grpc-coverage.xml' || '' }}"
env:
PGSQL_DATABASE_URL: pgsql://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports['5432'] }}/postgres?serverVersion=11&charset=utf8
PGSQL_DATABASE_URL: pgsql://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports['5432'] }}/postgres?serverVersion=18&charset=utf8
MYSQL_DATABASE_URL: mysql://mysql:mysql@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/mysql
SQLITE_DATABASE_URL: "sqlite:///:memory:"
AZURITE_HOST: "localhost"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ jobs:

phpunit-telemetry-tests:
uses: ./.github/workflows/job-phpunit-telemetry-tests.yml
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

extension-tests:
uses: ./.github/workflows/job-extension-tests.yml
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<env name="S3_BUCKET" value="flowphpbucket01"/>
<env name="REDIS_HOST" value="localhost"/>
<env name="REDIS_PORT" value="6379"/>
<env name="PGSQL_DATABASE_URL" value="pgsql://postgres:postgres@127.0.0.1:5432/postgres?serverVersion=11%26charset=utf8"/>
<env name="PGSQL_DATABASE_URL" value="pgsql://postgres:postgres@127.0.0.1:5432/postgres?serverVersion=18%26charset=utf8"/>
<env name="MYSQL_DATABASE_URL" value="mysql://mysql:mysql@127.0.0.1:3306/mysql"/>
<env name="SQLITE_DATABASE_PATH" value="./var/db/sqlite/test.db"/>
<env name="ELASTICSEARCH_URL" value="localhost:9200"/>
Expand Down
Loading