From a7589573b324bf7a278ce7f45c29c3d4b4f63698 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Fri, 5 Sep 2025 22:18:09 -0400 Subject: [PATCH 1/4] Use test containers to debug ImageMagick failures --- tools/local-env/php-8.3-docker-compose.override.yml | 4 ++-- tools/local-env/php-8.4-docker-compose.override.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/local-env/php-8.3-docker-compose.override.yml b/tools/local-env/php-8.3-docker-compose.override.yml index c9e2a647b4b8d..e75021b040570 100644 --- a/tools/local-env/php-8.3-docker-compose.override.yml +++ b/tools/local-env/php-8.3-docker-compose.override.yml @@ -4,10 +4,10 @@ services: php: - image: wordpressdevelop/php@sha256:c0ba85936a9d1ac2c98bf3da2d62ceb0e5787a6b11e383630df0c5a5bf2534b5 + image: ghcr.io/wordpress/wpdev-docker-images/php:8.3-fpm-186 cli: - image: wordpressdevelop/cli@sha256:85ad7d7a9c3bd9a8775fc83aea7f7dfc0aad25b2bc4f7d740696b28cd2a0ef89 + image: ghcr.io/wordpress/wpdev-docker-images/cli:8.3-fpm-186 memcached: # Pinning to the latest `bookworm` image is a temporary solution diff --git a/tools/local-env/php-8.4-docker-compose.override.yml b/tools/local-env/php-8.4-docker-compose.override.yml index 12f07e788c2b8..fd0df7ebb81b2 100644 --- a/tools/local-env/php-8.4-docker-compose.override.yml +++ b/tools/local-env/php-8.4-docker-compose.override.yml @@ -4,10 +4,10 @@ services: php: - image: wordpressdevelop/php@sha256:56d6cbf10d25bfcb80852c09c2fc2e967922881b233b6161ad2999df509eb59a + image: ghcr.io/wordpress/wpdev-docker-images/php:8.4-fpm-186 cli: - image: wordpressdevelop/cli@sha256:379f27b0c623c5cee5a7fbef1d617ce47fd3ba19158bac2e51861876fd68fdbf + image: ghcr.io/wordpress/wpdev-docker-images/cli:8.4-fpm-186 memcached: # Pinning to the latest `bookworm` image is a temporary solution From 71a12d2c74273c6a4c9201dee66bd6ac5f6e4409 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Fri, 5 Sep 2025 22:18:53 -0400 Subject: [PATCH 2/4] Introduce a PHP change to run unit tests --- src/xmlrpc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/xmlrpc.php b/src/xmlrpc.php index ae73f687a2daa..4ff46aaed7b41 100644 --- a/src/xmlrpc.php +++ b/src/xmlrpc.php @@ -86,6 +86,7 @@ exit; + /** * logIO() - Writes logging info to a file. * From 7337ca93562d30ac6bf0687e560de981c908548b Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Fri, 5 Sep 2025 22:26:47 -0400 Subject: [PATCH 3/4] Copy over changes fixing SSL issues --- .github/workflows/local-docker-environment.yml | 2 +- .github/workflows/performance.yml | 4 ++-- docker-compose.yml | 1 + tools/local-env/mysql-client.cnf | 2 ++ tools/local-env/scripts/install.js | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 tools/local-env/mysql-client.cnf diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml index 9e9b1259ea60d..bf275abd72205 100644 --- a/.github/workflows/local-docker-environment.yml +++ b/.github/workflows/local-docker-environment.yml @@ -92,7 +92,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-24.04 ] - memcached: [ false ] + memcached: [ false, true ] php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }} db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }} diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 2db92975d7b28..43970724574ae 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -101,7 +101,7 @@ jobs: strategy: fail-fast: false matrix: - memcached: [ false ] + memcached: [ false, true ] multisite: [ true, false ] subject: ${{ fromJson( needs.determine-matrix.outputs.subjects ) }} with: @@ -119,7 +119,7 @@ jobs: strategy: fail-fast: false matrix: - memcached: [ false ] + memcached: [ false, true ] multisite: [ true, false ] # A matrix value is needed in the 'name' directive for proper grouping in the GitHub UI. label: [ Compare ] diff --git a/docker-compose.yml b/docker-compose.yml index 863cbd2ea9b1b..eb8bae8b83d62 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -110,6 +110,7 @@ services: volumes: - ./:/var/www + - ./tools/local-env/mysql-client.cnf:/etc/mysql/conf.d/no-ssl.cnf:ro # Keeps the service alive. command: 'sleep infinity' diff --git a/tools/local-env/mysql-client.cnf b/tools/local-env/mysql-client.cnf new file mode 100644 index 0000000000000..f5e5c84d116e4 --- /dev/null +++ b/tools/local-env/mysql-client.cnf @@ -0,0 +1,2 @@ +[client] +ssl=0 diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js index 3ea702d021e24..44b9d1596a7ee 100644 --- a/tools/local-env/scripts/install.js +++ b/tools/local-env/scripts/install.js @@ -46,7 +46,7 @@ wait_on( { process.exit( 1 ); } ) .then( () => { - wp_cli( 'db reset --yes' ); + wp_cli( 'db reset --yes --defaults' ); const installCommand = process.env.LOCAL_MULTISITE === 'true' ? 'multisite-install' : 'install'; wp_cli( `core ${ installCommand } --title="WordPress Develop" --admin_user=admin --admin_password=password --admin_email=test@example.com --skip-email --url=http://localhost:${process.env.LOCAL_PORT}` ); } ) From fde08efcc3ba2c04f733be26c01feb29639f15b0 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Fri, 5 Sep 2025 23:10:11 -0400 Subject: [PATCH 4/4] Only run media tests for now --- .github/workflows/phpunit-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 420506d42265c..e4910d1d30f02 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -125,6 +125,7 @@ jobs: memcached: ${{ matrix.memcached }} phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }} tests-domain: ${{ matrix.tests-domain }} + phpunit-test-groups: 'media' report: ${{ matrix.report || false }} # @@ -175,6 +176,7 @@ jobs: multisite: ${{ matrix.multisite }} memcached: ${{ matrix.memcached }} phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }} + phpunit-test-groups: 'media' report: ${{ false }} # @@ -221,6 +223,7 @@ jobs: multisite: ${{ matrix.multisite }} memcached: ${{ matrix.memcached }} phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }} + phpunit-test-groups: 'media' report: ${{ false }} #