Skip to content

Commit 939153c

Browse files
johnbillionspacedmonkey
authored andcommitted
Build/Test Tools: Switch back to using the latest stable PHP 8.4 and 8.3 images for the test environment.
The underlying issue that caused the MariaDB client in the updated CLI container to no longer trust a self-signed certificate from the MySQL server has been resolved in WordPress/wpdev-docker-images#190. This change also reinstates the memcached test jobs as the underlying issue where its path resolution was incorrect has been resolved in WordPress/wpdev-docker-images#181. Props SirLouen, desrosj, johnbillion, kadamwhite, jorbin, davidbaumwald, bernhard-reiter, St. Virtualis of Dockeria Fizes #63876 git-svn-id: https://develop.svn.wordpress.org/trunk@60735 602fd350-edb4-49c9-b593-d223f7449a82
1 parent cb88622 commit 939153c

9 files changed

+4
-60
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 ]

.github/workflows/reusable-end-to-end-tests.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@ jobs:
8181
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
8282
persist-credentials: false
8383

84-
- name: Create a Docker override file
85-
if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php-version ) }}
86-
env:
87-
PHP_VERSION: ${{ inputs.php-version }}
88-
run: cp "tools/local-env/php-$PHP_VERSION-docker-compose.override.yml" docker-compose.override.yml
89-
9084
- name: Set up Node.js
9185
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
9286
with:

.github/workflows/reusable-performance-test-v2.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,6 @@ jobs:
121121
fetch-depth: ${{ github.event_name == 'workflow_dispatch' && '2' || '1' }}
122122
persist-credentials: false
123123

124-
- name: Create a Docker override file
125-
if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php-version ) }}
126-
env:
127-
PHP_VERSION: ${{ inputs.php-version }}
128-
run: cp "tools/local-env/php-$PHP_VERSION-docker-compose.override.yml" docker-compose.override.yml
129-
130124
- name: Set up Node.js
131125
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
132126
with:

.github/workflows/reusable-phpunit-tests-v3.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,6 @@ jobs:
136136
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
137137
persist-credentials: false
138138

139-
- name: Create a Docker override file
140-
if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php ) }}
141-
env:
142-
PHP_VERSION: ${{ inputs.php }}
143-
run: cp "tools/local-env/php-${{ env.PHP_VERSION }}-docker-compose.override.yml" docker-compose.override.yml
144-
145139
- name: Set up Node.js
146140
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
147141
with:

.github/workflows/reusable-test-local-docker-environment-v1.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ jobs:
9191
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
9292
persist-credentials: false
9393

94-
- name: Create a Docker override file
95-
if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php ) }}
96-
env:
97-
PHP_VERSION: ${{ inputs.php }}
98-
run: cp "tools/local-env/php-$PHP_VERSION-docker-compose.override.yml" docker-compose.override.yml
99-
10094
- name: Set up Node.js
10195
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
10296
with:

tools/local-env/php-8.3-docker-compose.override.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

tools/local-env/php-8.4-docker-compose.override.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

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)