Skip to content

Commit 7337ca9

Browse files
committed
Copy over changes fixing SSL issues
1 parent 71a12d2 commit 7337ca9

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.github/workflows/local-docker-environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
fail-fast: false
9393
matrix:
9494
os: [ ubuntu-24.04 ]
95-
memcached: [ false ]
95+
memcached: [ false, true ]
9696
php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }}
9797
db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }}
9898

.github/workflows/performance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
strategy:
102102
fail-fast: false
103103
matrix:
104-
memcached: [ false ]
104+
memcached: [ false, true ]
105105
multisite: [ true, false ]
106106
subject: ${{ fromJson( needs.determine-matrix.outputs.subjects ) }}
107107
with:
@@ -119,7 +119,7 @@ jobs:
119119
strategy:
120120
fail-fast: false
121121
matrix:
122-
memcached: [ false ]
122+
memcached: [ false, true ]
123123
multisite: [ true, false ]
124124
# A matrix value is needed in the 'name' directive for proper grouping in the GitHub UI.
125125
label: [ Compare ]

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ services:
110110

111111
volumes:
112112
- ./:/var/www
113+
- ./tools/local-env/mysql-client.cnf:/etc/mysql/conf.d/no-ssl.cnf:ro
113114

114115
# Keeps the service alive.
115116
command: 'sleep infinity'

tools/local-env/mysql-client.cnf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[client]
2+
ssl=0

tools/local-env/scripts/install.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ wait_on( {
4646
process.exit( 1 );
4747
} )
4848
.then( () => {
49-
wp_cli( 'db reset --yes' );
49+
wp_cli( 'db reset --yes --defaults' );
5050
const installCommand = process.env.LOCAL_MULTISITE === 'true' ? 'multisite-install' : 'install';
5151
wp_cli( `core ${ installCommand } --title="WordPress Develop" --admin_user=admin --admin_password=password [email protected] --skip-email --url=http://localhost:${process.env.LOCAL_PORT}` );
5252
} )

0 commit comments

Comments
 (0)