Skip to content

Commit 1734534

Browse files
johnbillionjohnbillion
committed
Merge branch 'trunk' into 47256-composer-libraries
# Conflicts: # composer.json
2 parents 778ff31 + bd48357 commit 1734534

File tree

242 files changed

+3673
-1865
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+3673
-1865
lines changed

‎.github/workflows/install-testing.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,12 @@ jobs:
9595
- db-version: '9.1'
9696
- db-version: '9.2'
9797
- db-version: '9.3'
98+
- db-version: '9.4'
9899
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
99100
- php: '7.2'
100-
db-version: '9.4'
101+
db-version: '9.5'
101102
- php: '7.3'
102-
db-version: '9.4'
103+
db-version: '9.5'
103104

104105
services:
105106
database:

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,12 @@ jobs:
105105
- db-version: '9.1'
106106
- db-version: '9.2'
107107
- db-version: '9.3'
108+
- db-version: '9.4'
108109
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
109110
- php: '7.2'
110-
db-version: '9.4'
111+
db-version: '9.5'
111112
- php: '7.3'
112-
db-version: '9.4'
113+
db-version: '9.5'
113114
# No PHP 8.5 + Memcached support yet.
114115
- php: '8.5'
115116
memcached: true

‎.github/workflows/phpunit-tests.yml‎

Lines changed: 4 additions & 253 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ jobs:
7171
strategy:
7272
fail-fast: false
7373
matrix:
74-
event: ['${{ github.event_name }}']
7574
os: [ ubuntu-24.04 ]
7675
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
7776
db-type: [ 'mysql' ]
@@ -80,64 +79,6 @@ jobs:
8079
multisite: [ false, true ]
8180
memcached: [ false ]
8281

83-
exclude:
84-
# Trim the matrix on Pull Requests to reduce the number of concurrent jobs.
85-
# Each PHP version is tested againgst one version of MySQL.
86-
- event: pull_request
87-
php: '7.2'
88-
db-version: '8.0'
89-
- event: pull_request
90-
php: '7.2'
91-
db-version: '8.4'
92-
- event: pull_request
93-
php: '7.3'
94-
db-version: '5.7'
95-
- event: pull_request
96-
php: '7.3'
97-
db-version: '8.4'
98-
- event: pull_request
99-
php: '7.4'
100-
db-version: '5.7'
101-
- event: pull_request
102-
php: '7.4'
103-
db-version: '8.0'
104-
- event: pull_request
105-
php: '8.0'
106-
db-version: '8.0'
107-
- event: pull_request
108-
php: '8.0'
109-
db-version: '8.4'
110-
- event: pull_request
111-
php: '8.1'
112-
db-version: '5.7'
113-
- event: pull_request
114-
php: '8.1'
115-
db-version: '8.4'
116-
- event: pull_request
117-
php: '8.2'
118-
db-version: '5.7'
119-
- event: pull_request
120-
php: '8.2'
121-
db-version: '8.0'
122-
- event: pull_request
123-
php: '8.3'
124-
db-version: '8.0'
125-
- event: pull_request
126-
php: '8.3'
127-
db-version: '8.4'
128-
- event: pull_request
129-
php: '8.4'
130-
db-version: '5.7'
131-
- event: pull_request
132-
php: '8.4'
133-
db-version: '8.4'
134-
- event: pull_request
135-
php: '8.5'
136-
db-version: '5.7'
137-
- event: pull_request
138-
php: '8.5'
139-
db-version: '8.0'
140-
14182
include:
14283
# Include jobs that test with memcached.
14384
- os: ubuntu-24.04
@@ -207,184 +148,13 @@ jobs:
207148
strategy:
208149
fail-fast: false
209150
matrix:
210-
event: ['${{ github.event_name }}']
211151
os: [ ubuntu-24.04 ]
212152
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
213153
db-type: [ 'mariadb' ]
214154
db-version: [ '5.5', '10.3', '10.5', '10.6', '10.11', '11.4', '11.8' ]
215155
multisite: [ false, true ]
216156
memcached: [ false ]
217157

218-
exclude:
219-
# Trim the matrix on Pull Requests to reduce the number of concurrent jobs.
220-
# Each PHP version is tested against one version of MariaDB.
221-
# Each MariaDB version is tested at least once.
222-
- event: pull_request
223-
php: '7.2'
224-
db-version: '10.3'
225-
- event: pull_request
226-
php: '7.2'
227-
db-version: '10.5'
228-
- event: pull_request
229-
php: '7.2'
230-
db-version: '10.6'
231-
- event: pull_request
232-
php: '7.2'
233-
db-version: '10.11'
234-
- event: pull_request
235-
php: '7.2'
236-
db-version: '11.4'
237-
- event: pull_request
238-
php: '7.2'
239-
db-version: '11.8'
240-
- event: pull_request
241-
php: '7.3'
242-
db-version: '5.5'
243-
- event: pull_request
244-
php: '7.3'
245-
db-version: '10.5'
246-
- event: pull_request
247-
php: '7.3'
248-
db-version: '10.6'
249-
- event: pull_request
250-
php: '7.3'
251-
db-version: '10.11'
252-
- event: pull_request
253-
php: '7.3'
254-
db-version: '11.4'
255-
- event: pull_request
256-
php: '7.3'
257-
db-version: '11.8'
258-
- event: pull_request
259-
php: '7.4'
260-
db-version: '5.5'
261-
- event: pull_request
262-
php: '7.4'
263-
db-version: '10.3'
264-
- event: pull_request
265-
php: '7.4'
266-
db-version: '10.5'
267-
- event: pull_request
268-
php: '7.4'
269-
db-version: '10.6'
270-
- event: pull_request
271-
php: '7.4'
272-
db-version: '10.11'
273-
- event: pull_request
274-
php: '7.4'
275-
db-version: '11.4'
276-
- event: pull_request
277-
php: '7.4'
278-
db-version: '11.8'
279-
- event: pull_request
280-
php: '8.0'
281-
db-version: '5.5'
282-
- event: pull_request
283-
php: '8.0'
284-
db-version: '10.3'
285-
- event: pull_request
286-
php: '8.0'
287-
db-version: '10.6'
288-
- event: pull_request
289-
php: '8.0'
290-
db-version: '10.11'
291-
- event: pull_request
292-
php: '8.0'
293-
db-version: '11.4'
294-
- event: pull_request
295-
php: '8.0'
296-
db-version: '11.8'
297-
- event: pull_request
298-
php: '8.1'
299-
db-version: '5.5'
300-
- event: pull_request
301-
php: '8.1'
302-
db-version: '10.3'
303-
- event: pull_request
304-
php: '8.1'
305-
db-version: '10.5'
306-
- event: pull_request
307-
php: '8.1'
308-
db-version: '10.11'
309-
- event: pull_request
310-
php: '8.1'
311-
db-version: '11.4'
312-
- event: pull_request
313-
php: '8.1'
314-
db-version: '11.8'
315-
- event: pull_request
316-
php: '8.2'
317-
db-version: '5.5'
318-
- event: pull_request
319-
php: '8.2'
320-
db-version: '10.3'
321-
- event: pull_request
322-
php: '8.2'
323-
db-version: '10.5'
324-
- event: pull_request
325-
php: '8.2'
326-
db-version: '10.6'
327-
- event: pull_request
328-
php: '8.2'
329-
db-version: '11.4'
330-
- event: pull_request
331-
php: '8.2'
332-
db-version: '11.8'
333-
- event: pull_request
334-
php: '8.3'
335-
db-version: '5.5'
336-
- event: pull_request
337-
php: '8.3'
338-
db-version: '10.3'
339-
- event: pull_request
340-
php: '8.3'
341-
db-version: '10.5'
342-
- event: pull_request
343-
php: '8.3'
344-
db-version: '10.6'
345-
- event: pull_request
346-
php: '8.3'
347-
db-version: '10.11'
348-
- event: pull_request
349-
php: '8.3'
350-
db-version: '11.8'
351-
- event: pull_request
352-
php: '8.4'
353-
db-version: '5.5'
354-
- event: pull_request
355-
php: '8.4'
356-
db-version: '10.3'
357-
- event: pull_request
358-
php: '8.4'
359-
db-version: '10.5'
360-
- event: pull_request
361-
php: '8.4'
362-
db-version: '10.6'
363-
- event: pull_request
364-
php: '8.4'
365-
db-version: '10.11'
366-
- event: pull_request
367-
php: '8.4'
368-
db-version: '11.4'
369-
- event: pull_request
370-
php: '8.5'
371-
db-version: '5.5'
372-
- event: pull_request
373-
php: '8.5'
374-
db-version: '10.3'
375-
- event: pull_request
376-
php: '8.5'
377-
db-version: '10.5'
378-
- event: pull_request
379-
php: '8.5'
380-
db-version: '10.6'
381-
- event: pull_request
382-
php: '8.5'
383-
db-version: '10.11'
384-
- event: pull_request
385-
php: '8.5'
386-
db-version: '11.4'
387-
388158
include:
389159
# Include jobs that test with memcached.
390160
- os: ubuntu-24.04
@@ -430,44 +200,25 @@ jobs:
430200
strategy:
431201
fail-fast: false
432202
matrix:
433-
event: ['${{ github.event_name }}']
434203
os: [ ubuntu-24.04 ]
435204
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
436205
db-type: [ 'mysql', 'mariadb' ]
437-
db-version: [ '9.4', '12.0' ]
206+
db-version: [ '9.5', '12.0' ]
438207
multisite: [ false, true ]
439208
memcached: [ false ]
440209
db-innovation: [ true ]
441210

442211
exclude:
443212
# MySQL 9.0+ will not work on PHP <= 7.3 because mysql_native_password was removed. See https://core.trac.wordpress.org/ticket/61218.
444213
- php: '7.2'
445-
db-version: '9.4'
214+
db-version: '9.5'
446215
- php: '7.3'
447-
db-version: '9.4'
216+
db-version: '9.5'
448217
# Exclude version combinations that don't exist.
449218
- db-type: 'mariadb'
450-
db-version: '9.4'
219+
db-version: '9.5'
451220
- db-type: 'mysql'
452221
db-version: '12.0'
453-
# On Pull requests, only test each innovation release once.
454-
- event: pull_request
455-
php: '7.3'
456-
- event: pull_request
457-
php: '7.4'
458-
- event: pull_request
459-
php: '8.0'
460-
- event: pull_request
461-
php: '8.1'
462-
- event: pull_request
463-
php: '8.1'
464-
- event: pull_request
465-
php: '8.2'
466-
- event: pull_request
467-
php: '8.4'
468-
- event: pull_request
469-
php: '8.5'
470-
471222
with:
472223
os: ${{ matrix.os }}
473224
php: ${{ matrix.php }}

‎.github/workflows/test-old-branches.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ jobs:
4545
'test-build-processes.yml'
4646
]
4747
branch: [
48-
'6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1','6.0',
48+
'6.9', '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1','6.0',
4949
'5.9', '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0',
5050
'4.9', '4.8', '4.7'
5151
]
5252
include:
5353
# PHP Compatibility testing was introduced in 5.5.
54+
- branch: '6.9'
55+
workflow: 'php-compatibility.yml'
5456
- branch: '6.8'
5557
workflow: 'php-compatibility.yml'
5658
- branch: '6.7'
@@ -83,6 +85,8 @@ jobs:
8385
# End-to-end testing was introduced in 5.3 but was later removed as there were no meaningful assertions.
8486
# Starting in 5.8 with #52905, some additional tests with real assertions were introduced.
8587
# Branches 5.8 and newer should be tested to confirm no regressions are introduced.
88+
- branch: '6.9'
89+
workflow: 'end-to-end-tests.yml'
8690
- branch: '6.8'
8791
workflow: 'end-to-end-tests.yml'
8892
- branch: '6.7'
@@ -109,6 +113,8 @@ jobs:
109113
# Performance testing was introduced in 6.2 using Puppeteer but was overhauled to use Playwright instead in 6.4.
110114
# Since the workflow frequently failed for 6.2 and 6.3 due to the flaky nature of the Puppeteer tests,
111115
# the workflow was removed from those two branches.
116+
- branch: '6.9'
117+
workflow: 'performance.yml'
112118
- branch: '6.8'
113119
workflow: 'performance.yml'
114120
- branch: '6.7'

‎.github/workflows/upgrade-develop-testing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
db-type: [ 'mysql' ]
6868
db-version: [ '5.7', '8.4' ]
6969
# WordPress 4.9 is the oldest version that supports PHP 7.2.
70-
wp: [ '4.9', '6.6', '6.7', '6.8' ]
70+
wp: [ '4.9', '6.7', '6.8', '6.9-RC1' ]
7171
multisite: [ false, true ]
7272

7373
exclude:

0 commit comments

Comments
 (0)