Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/local-docker-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 ]
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/phpunit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

#
Expand Down Expand Up @@ -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 }}

#
Expand Down Expand Up @@ -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 }}

#
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions src/xmlrpc.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@

exit;


/**
* logIO() - Writes logging info to a file.
*
Expand Down
2 changes: 2 additions & 0 deletions tools/local-env/mysql-client.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[client]
ssl=0
4 changes: 2 additions & 2 deletions tools/local-env/php-8.3-docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/local-env/php-8.4-docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/local-env/scripts/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}` );
} )
Expand Down
Loading