From 6113803d12f9cc5b46efaed8a5ecea40f42eb2ee Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Fri, 26 Mar 2021 13:23:52 +0000 Subject: [PATCH] Build/Test Tools: Fix code coverage reporting to generate report from `src`. Since [50441-50442] switched the test workflows to run from `src` instead of `build`, code coverage reporting has stopped working. This was caused by the code coverage configuration continuing to reference `build`. This corrects the configuration so coverage reporting can resume. This change also introduces the `workflow_dispatch` event to the workflow, which will allow committers to manually run the workflow when desired. For example, to confirm changes to the test suite do not break reporting. This also adds the `phpunit.xml.dist` and `tests/phpunit/multisite.xml` files to the `paths` list. Since these files are responsible for configuring the test suite and code coverage reporting, any changes to them should verify that no problems were introduced. Props jrf, johnbillion. Fixes #52786. See #51734. git-svn-id: https://develop.svn.wordpress.org/trunk@50592 602fd350-edb4-49c9-b593-d223f7449a82 --- .github/workflows/test-coverage.yml | 10 ++++++ phpunit.xml.dist | 52 ++++++++++++++--------------- tests/phpunit/multisite.xml | 52 ++++++++++++++--------------- 3 files changed, 62 insertions(+), 52 deletions(-) diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml index 0ecfc8e784..e6e904bc72 100644 --- a/.github/workflows/test-coverage.yml +++ b/.github/workflows/test-coverage.yml @@ -1,9 +1,19 @@ name: Code Coverage Report on: + # Verify + push: + branches: + - master + - trunk + paths: + - 'phpunit.xml.dist' + - 'tests/phpunit/multisite.xml' # Once daily at 00:00 UTC. schedule: - cron: '0 0 * * *' + # Allow manually triggering the workflow. + workflow_dispatch: env: PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }} diff --git a/phpunit.xml.dist b/phpunit.xml.dist index cebef5de31..4036f34c52 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -42,38 +42,38 @@ - build + src - build/wp-includes/ID3 - build/wp-includes/IXR - build/wp-includes/random_compat - build/wp-includes/PHPMailer - build/wp-includes/Requests - build/wp-includes/SimplePie - build/wp-includes/sodium_compat - build/wp-includes/Text + src/wp-includes/ID3 + src/wp-includes/IXR + src/wp-includes/random_compat + src/wp-includes/PHPMailer + src/wp-includes/Requests + src/wp-includes/SimplePie + src/wp-includes/sodium_compat + src/wp-includes/Text - build/wp-content/ + src/wp-content/ - build/wp-admin/includes/class-ftp* - build/wp-admin/includes/class-pclzip.php - build/wp-admin/includes/deprecated.php - build/wp-admin/includes/ms-deprecated.php + src/wp-admin/includes/class-ftp* + src/wp-admin/includes/class-pclzip.php + src/wp-admin/includes/deprecated.php + src/wp-admin/includes/ms-deprecated.php - build/wp-includes/atomlib.php - build/wp-includes/class-IXR.php - build/wp-includes/class-json.php - build/wp-includes/class-phpass.php - build/wp-includes/class-pop3.php - build/wp-includes/class-requests.php - build/wp-includes/class-simplepie.php - build/wp-includes/class-snoopy.php - build/wp-includes/deprecated.php - build/wp-includes/ms-deprecated.php - build/wp-includes/pluggable-deprecated.php - build/wp-includes/rss.php + src/wp-includes/atomlib.php + src/wp-includes/class-IXR.php + src/wp-includes/class-json.php + src/wp-includes/class-phpass.php + src/wp-includes/class-pop3.php + src/wp-includes/class-requests.php + src/wp-includes/class-simplepie.php + src/wp-includes/class-snoopy.php + src/wp-includes/deprecated.php + src/wp-includes/ms-deprecated.php + src/wp-includes/pluggable-deprecated.php + src/wp-includes/rss.php diff --git a/tests/phpunit/multisite.xml b/tests/phpunit/multisite.xml index b2ac638609..8cbc2a5404 100644 --- a/tests/phpunit/multisite.xml +++ b/tests/phpunit/multisite.xml @@ -41,38 +41,38 @@ - ../../build + ../../src - ../../build/wp-includes/ID3 - ../../build/wp-includes/IXR - ../../build/wp-includes/random_compat - ../../build/wp-includes/PHPMailer - ../../build/wp-includes/Requests - ../../build/wp-includes/SimplePie - ../../build/wp-includes/sodium_compat - ../../build/wp-includes/Text + ../../src/wp-includes/ID3 + ../../src/wp-includes/IXR + ../../src/wp-includes/random_compat + ../../src/wp-includes/PHPMailer + ../../src/wp-includes/Requests + ../../src/wp-includes/SimplePie + ../../src/wp-includes/sodium_compat + ../../src/wp-includes/Text - ../../build/wp-content/ + ../../src/wp-content/ - ../../build/wp-admin/includes/class-ftp* - ../../build/wp-admin/includes/class-pclzip.php - ../../build/wp-admin/includes/deprecated.php - ../../build/wp-admin/includes/ms-deprecated.php + ../../src/wp-admin/includes/class-ftp* + ../../src/wp-admin/includes/class-pclzip.php + ../../src/wp-admin/includes/deprecated.php + ../../src/wp-admin/includes/ms-deprecated.php - ../../build/wp-includes/atomlib.php - ../../build/wp-includes/class-IXR.php - ../../build/wp-includes/class-json.php - ../../build/wp-includes/class-phpass.php - ../../build/wp-includes/class-pop3.php - ../../build/wp-includes/class-requests.php - ../../build/wp-includes/class-simplepie.php - ../../build/wp-includes/class-snoopy.php - ../../build/wp-includes/deprecated.php - ../../build/wp-includes/ms-deprecated.php - ../../build/wp-includes/pluggable-deprecated.php - ../../build/wp-includes/rss.php + ../../src/wp-includes/atomlib.php + ../../src/wp-includes/class-IXR.php + ../../src/wp-includes/class-json.php + ../../src/wp-includes/class-phpass.php + ../../src/wp-includes/class-pop3.php + ../../src/wp-includes/class-requests.php + ../../src/wp-includes/class-simplepie.php + ../../src/wp-includes/class-snoopy.php + ../../src/wp-includes/deprecated.php + ../../src/wp-includes/ms-deprecated.php + ../../src/wp-includes/pluggable-deprecated.php + ../../src/wp-includes/rss.php