Skip to content

Commit 4e28109

Browse files
committed
Build/Test Tools: Add MySQL 9.7 to relevenat test matrices.
This adds `9.7` (released on April 21, 2026) to the relevant testing strategies and makes it the default version in the local Docker environment. MySQL 9.7 is also an LTS release. Props chrisdavidmiles. See #64894. git-svn-id: https://develop.svn.wordpress.org/trunk@62407 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 207702c commit 4e28109

6 files changed

Lines changed: 16 additions & 22 deletions

File tree

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ LOCAL_DB_TYPE=mysql
4646
##
4747
# The database version to use.
4848
#
49-
# Defaults to 8.0 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
49+
# Defaults to 9.7 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
5050
#
5151
# When using `mysql`, see https://hub.docker.com/_/mysql for valid versions.
5252
# When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
5353
##
54-
LOCAL_DB_VERSION=8.4
54+
LOCAL_DB_VERSION=9.7
5555

5656
# Whether or not to enable multisite.
5757
LOCAL_MULTISITE=false

.github/workflows/install-testing.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,12 @@ jobs:
9494
- db-version: '9.3'
9595
- db-version: '9.4'
9696
- db-version: '9.5'
97+
- db-version: '9.6'
9798
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
9899
- php: '7.2'
99-
db-version: '9.6'
100+
db-version: '9.7'
100101
- php: '7.3'
101-
db-version: '9.6'
102+
db-version: '9.7'
102103

103104
services:
104105
database:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ jobs:
108108
- db-version: '9.3'
109109
- db-version: '9.4'
110110
- db-version: '9.5'
111+
- db-version: '9.6'
111112
# No PHP 8.5 + Memcached support yet.
112113
- php: '8.5'
113114
memcached: true

.github/workflows/phpunit-tests.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
os: [ ubuntu-24.04 ]
7777
php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
7878
db-type: [ 'mysql' ]
79-
db-version: [ '5.7', '8.0', '8.4' ]
79+
db-version: [ '5.7', '8.0', '8.4', '9.7' ]
8080
tests-domain: [ 'example.org' ]
8181
multisite: [ false, true ]
8282
memcached: [ false ]
@@ -209,15 +209,13 @@ jobs:
209209
os: [ ubuntu-24.04 ]
210210
php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
211211
db-type: [ 'mysql', 'mariadb' ]
212-
db-version: [ '9.6', '12.1' ]
212+
db-version: [ '12.1' ]
213213
multisite: [ false, true ]
214214
memcached: [ false ]
215215
db-innovation: [ true ]
216216

217217
exclude:
218218
# Exclude version combinations that don't exist.
219-
- db-type: 'mariadb'
220-
db-version: '9.6'
221219
- db-type: 'mysql'
222220
db-version: '12.1'
223221
with:
@@ -283,14 +281,14 @@ jobs:
283281
fail-fast: false
284282
matrix:
285283
php: [ '7.4', '8.4' ]
286-
db-version: [ '8.4', '11.8' ]
284+
db-version: [ '9.7', '11.8' ]
287285
db-type: [ 'mysql', 'mariadb' ]
288286
multisite: [ false ]
289287

290288
include:
291289
# Include one multisite job for each database type.
292290
- php: '8.4'
293-
db-version: '8.4'
291+
db-version: '9.7'
294292
db-type: 'mysql'
295293
multisite: true
296294
- php: '8.4'
@@ -299,13 +297,13 @@ jobs:
299297
multisite: true
300298
# Test with memcached.
301299
- php: '8.4'
302-
db-version: '8.4'
300+
db-version: '9.7'
303301
db-type: 'mysql'
304302
multisite: true
305303
memcached: true
306304
# Run specific test groups once.
307305
- php: '8.4'
308-
db-version: '8.4'
306+
db-version: '9.7'
309307
db-type: 'mysql'
310308
phpunit-test-groups: 'html-api-html5lib-tests'
311309

@@ -314,7 +312,7 @@ jobs:
314312
- db-type: 'mysql'
315313
db-version: '11.8'
316314
- db-type: 'mariadb'
317-
db-version: '8.4'
315+
db-version: '9.7'
318316

319317
with:
320318
php: ${{ matrix.php }}

.github/workflows/upgrade-testing.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
os: [ 'ubuntu-24.04' ]
7171
php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
7272
db-type: [ 'mysql' ]
73-
db-version: [ '5.7', '8.0', '8.4', '9.6' ]
73+
db-version: [ '5.7', '8.0', '8.4', '9.7' ]
7474
wp: [ '6.9', '7.0' ]
7575
multisite: [ false, true ]
7676
with:
@@ -179,7 +179,7 @@ jobs:
179179
os: [ 'ubuntu-24.04' ]
180180
php: [ '7.4' ]
181181
db-type: [ 'mysql' ]
182-
db-version: [ '5.7', '8.0', '8.4', '9.6' ]
182+
db-version: [ '5.7', '8.0', '8.4', '9.7' ]
183183
wp: [ '4.7' ]
184184
multisite: [ false, true ]
185185
with:

.version-support-mysql.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
{
22
"7-1": [
3-
"9.6",
4-
"9.5",
5-
"9.4",
6-
"9.3",
7-
"9.2",
8-
"9.1",
9-
"9.0",
3+
"9.7",
104
"8.4",
115
"8.0",
126
"5.7",

0 commit comments

Comments
 (0)