diff --git a/.codecov.yaml b/.codecov.yaml index c80924c4b..cac447d8f 100644 --- a/.codecov.yaml +++ b/.codecov.yaml @@ -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: @@ -16,6 +16,8 @@ flag_management: carryforward: true - name: arrow-extension carryforward: true + - name: telemetry-tests + carryforward: true component_management: individual_components: diff --git a/.github/workflows/job-arrow-extension.yml b/.github/workflows/job-arrow-extension.yml index 67489cd70..5398ff78a 100644 --- a/.github/workflows/job-arrow-extension.yml +++ b/.github/workflows/job-arrow-extension.yml @@ -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' }} diff --git a/.github/workflows/job-extension-tests.yml b/.github/workflows/job-extension-tests.yml index fc8d163ce..72867c9f7 100644 --- a/.github/workflows/job-extension-tests.yml +++ b/.github/workflows/job-extension-tests.yml @@ -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' }} diff --git a/.github/workflows/job-phpunit-telemetry-tests.yml b/.github/workflows/job-phpunit-telemetry-tests.yml index 8be7902e7..19350b158 100644 --- a/.github/workflows/job-phpunit-telemetry-tests.yml +++ b/.github/workflows/job-phpunit-telemetry-tests.yml @@ -2,6 +2,9 @@ name: PHPUnit Telemetry Bridge Tests on: workflow_call: + secrets: + CODECOV_TOKEN: + required: false permissions: contents: read @@ -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" @@ -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 diff --git a/.github/workflows/job-tests.yml b/.github/workflows/job-tests.yml index b9421e948..731209521 100644 --- a/.github/workflows/job-tests.yml +++ b/.github/workflows/job-tests.yml @@ -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" @@ -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" diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 9193748d3..acba5dfdc 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -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 diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 8be8b947a..4358565ee 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -20,7 +20,7 @@ - +