Skip to content

Commit b0f8a16

Browse files
committed
Build/Test Tools: Test against MySQL 8.4 in automated testing.
Additionally, MySQL 8.1, 8.2 and 8.3 have been removed. These were “innovation releases” and are no longer supported in favor of 8.4, which has LTS. Props ayeshrajans, johnbillion, aristath, jorbin. See #61218. git-svn-id: https://develop.svn.wordpress.org/trunk@59280 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 2e71cf3 commit b0f8a16

File tree

5 files changed

+46
-19
lines changed

5 files changed

+46
-19
lines changed

.github/workflows/install-testing.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ jobs:
125125
- db-version: '5.0'
126126
- db-version: '5.1'
127127
- db-version: '5.5'
128+
- php: '7.2'
129+
db-version: '8.4'
130+
- php: '7.3'
131+
db-version: '8.4'
128132

129133
services:
130134
database:
@@ -133,13 +137,13 @@ jobs:
133137
- 3306
134138
options: >-
135139
--health-cmd="mysqladmin ping"
136-
--health-interval=30s
137-
--health-timeout=10s
138-
--health-retries=5
139-
-e MYSQL_ROOT_PASSWORD=root
140-
-e MYSQL_DATABASE=test_db
140+
--health-interval="30s"
141+
--health-timeout="10s"
142+
--health-retries="5"
143+
-e MYSQL_ROOT_PASSWORD="root"
144+
-e MYSQL_DATABASE="test_db"
141145
--entrypoint sh ${{ matrix.db-type }}:${{ matrix.db-version }}
142-
-c "exec docker-entrypoint.sh mysqld${{ matrix.db-version != '5.5' && ' --default-authentication-plugin=mysql_native_password"' || '' }}
146+
-c "exec docker-entrypoint.sh mysqld${{ matrix.db-type == 'mysql' && contains( fromJSON('["7.2", "7.3"]'), matrix.php ) && ' --default-authentication-plugin=mysql_native_password' || '' }}"
143147
144148
steps:
145149
- name: Set up PHP ${{ matrix.php }}

.github/workflows/phpunit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
os: [ ubuntu-latest ]
4848
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
4949
db-type: [ 'mysql' ]
50-
db-version: [ '5.7', '8.0', '8.1', '8.2', '8.3' ]
50+
db-version: [ '5.7', '8.0', '8.4' ]
5151
tests-domain: [ 'example.org' ]
5252
multisite: [ false, true ]
5353
memcached: [ false ]

.github/workflows/reusable-upgrade-testing.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,16 @@ jobs:
5858
image: ${{ inputs.db-type }}:${{ inputs.db-version }}
5959
ports:
6060
- 3306
61-
options: --health-cmd="mysqladmin ping" --health-interval=30s --health-timeout=10s --health-retries=5 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=test_db --entrypoint sh ${{ inputs.db-type }}:${{ inputs.db-version }} -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
61+
options: >-
62+
--health-cmd="mysqladmin ping"
63+
--health-interval="30s"
64+
--health-timeout="10s"
65+
--health-retries="5"
66+
-e MYSQL_ROOT_PASSWORD="root"
67+
-e MYSQL_DATABASE="test_db"
68+
--entrypoint sh ${{ inputs.db-type }}:${{ inputs.db-version }}
69+
-c "exec docker-entrypoint.sh mysqld${{ inputs.db-type == 'mysql' && contains( fromJSON('["7.2", "7.3"]'), inputs.php ) && ' --default-authentication-plugin=mysql_native_password' || '' }}"
70+
6271
6372
steps:
6473
- name: Set up PHP ${{ inputs.php }}

.github/workflows/upgrade-testing.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,15 @@ jobs:
4545
os: [ 'ubuntu-latest' ]
4646
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
4747
db-type: [ 'mysql' ]
48-
db-version: [ '5.7', '8.0' ]
48+
db-version: [ '5.7', '8.0', '8.4' ]
4949
wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '6.6', '6.7-RC1' ]
5050
multisite: [ false, true ]
51+
52+
exclude:
53+
- php: '7.2'
54+
db-version: '8.4'
55+
- php: '7.3'
56+
db-version: '8.4'
5157
with:
5258
os: ${{ matrix.os }}
5359
php: ${{ matrix.php }}
@@ -68,9 +74,15 @@ jobs:
6874
os: [ 'ubuntu-latest' ]
6975
php: [ '7.2', '7.3', '7.4' ]
7076
db-type: [ 'mysql' ]
71-
db-version: [ '5.7', '8.0' ]
77+
db-version: [ '5.7', '8.0', '8.4' ]
7278
wp: [ '5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9' ]
7379
multisite: [ false, true ]
80+
81+
exclude:
82+
- php: '7.2'
83+
db-version: '8.4'
84+
- php: '7.3'
85+
db-version: '8.4'
7486
with:
7587
os: ${{ matrix.os }}
7688
php: ${{ matrix.php }}
@@ -95,7 +107,7 @@ jobs:
95107
os: [ 'ubuntu-latest' ]
96108
php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
97109
db-type: [ 'mysql' ]
98-
db-version: [ '5.7', '8.0' ]
110+
db-version: [ '5.7', '8.0', '8.4' ]
99111
wp: [ '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9' ]
100112
multisite: [ false, true ]
101113
with:
@@ -118,9 +130,15 @@ jobs:
118130
os: [ 'ubuntu-latest' ]
119131
php: [ '7.2', '7.3', '7.4' ]
120132
db-type: [ 'mysql' ]
121-
db-version: [ '5.7', '8.0' ]
133+
db-version: [ '5.7', '8.0', '8.4' ]
122134
wp: [ '4.1', '4.2', '4.3', '4.4', '4.5', '4.6', '4.7', '4.8', '4.9' ]
123135
multisite: [ false, true ]
136+
137+
exclude:
138+
- php: '7.2'
139+
db-version: '8.4'
140+
- php: '7.3'
141+
db-version: '8.4'
124142
with:
125143
os: ${{ matrix.os }}
126144
php: ${{ matrix.php }}
@@ -145,7 +163,7 @@ jobs:
145163
os: [ 'ubuntu-latest' ]
146164
php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
147165
db-type: [ 'mysql' ]
148-
db-version: [ '5.7', '8.0' ]
166+
db-version: [ '5.7', '8.0', '8.4' ]
149167
wp: [ '4.1', '4.2', '4.3', '4.4', '4.5' ]
150168
multisite: [ false, true ]
151169
with:

.version-support-mysql.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
{
22
"6-8": [
3-
"8.3",
4-
"8.2",
5-
"8.1",
3+
"8.4",
64
"8.0",
75
"5.7",
86
"5.6",
97
"5.5"
108
],
119
"6-7": [
12-
"8.3",
13-
"8.2",
14-
"8.1",
10+
"8.4",
1511
"8.0",
1612
"5.7",
1713
"5.6",

0 commit comments

Comments
 (0)