Skip to content

Commit b3f13cf

Browse files
sabernhardtsabernhardt
committed
Merge branch 'trunk' of https://github.com/sabernhardt/wordpress-develop into trunk
2 parents 598138c + 7682e9a commit b3f13cf

822 files changed

Lines changed: 24104 additions & 49557 deletions

File tree

Some content is hidden

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

‎.env.example‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,8 @@ LOCAL_WP_TESTS_DOMAIN=example.org
6767

6868
# The URL to use when running e2e tests.
6969
WP_BASE_URL=http://localhost:${LOCAL_PORT}
70+
71+
##
72+
# This silences the tips output by the dotenv package.
73+
##
74+
DOTENV_CONFIG_QUIET=true

‎.git-blame-ignore-revs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,14 @@ d44e1c2ce2dc638e89ed6a1d02b1cfadb8a15fe7 # [60048]
6161
a18719e7ea49ab7ac0091e076840cb7efdf51cc5 # [60049]
6262

6363
# 6.9 Coding Standards
64+
d0d89b62485e724e3d06f01981dd1940b2f36fce # [60074]
65+
c53010159b60735ffa6ba5fa8a416ff0e86a159c # [60109]
6466
cbb6519119276ceba4279eaee73ab66294ebd820 # [60402]
67+
3d736c763e0b1384c65abfa3bcf6d3bc45869516 # [60664]
68+
b96f25f5c31bfd1580c21084c368098792b4c741 # [60780]
69+
ff6c5fadfa6272685d910b474917ecb6adc17f10 # [60808]
70+
08b2f9cfe9064873a501c3543e2c995405431dcc # [60816]
71+
e683403cc1856113e3cb010b1579dcd01cdef5fc # [61036]
72+
8d24041c08a58b2f79504699fb3f63d01737b876 # [61075]
73+
87cbbb1dfcf19fcfc128fc66603462a649d01502 # [61087]
74+
db1b4811e5ab8df343b03032d7607abe01a9e8e2 # [61138]

‎.github/workflows/coding-standards.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ on:
99
- '3.[89]'
1010
- '[4-9].[0-9]'
1111
tags:
12-
- '[0-9]+.[0-9]'
13-
- '[0-9]+.[0-9].[0-9]+'
14-
- '!3.7.[0-9]+'
12+
- '3.[89]'
13+
- '3.[89].[0-9]+'
14+
- '[4-9].[0-9]'
15+
- '[4-9].[0-9].[0-9]+'
1516
pull_request:
1617
branches:
1718
- trunk
@@ -98,7 +99,7 @@ jobs:
9899
99100
steps:
100101
- name: Dispatch workflow run
101-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
102+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
102103
with:
103104
retries: 2
104105
retry-exempt-status-codes: 418

‎.github/workflows/commit-built-file-changes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
contents: write
4444
steps:
4545
- name: Download artifact
46-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
46+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
4747
with:
4848
script: |
4949
const artifacts = await github.rest.actions.listWorkflowRunArtifacts( {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ on:
88
- '5.[3-9]'
99
- '[6-9].[0-9]'
1010
tags:
11-
- '[0-9]+.[0-9]'
12-
- '[0-9]+.[0-9].[0-9]+'
13-
- '![34].[0-9].[0-9]+'
14-
- '!5.[0-2].[0-9]+'
11+
- '5.[3-9]'
12+
- '5.[3-9].[0-9]+'
13+
- '[6-9]+.[0-9]'
14+
- '[6-9]+.[0-9].[0-9]+'
1515
pull_request:
1616
branches:
1717
- trunk
@@ -103,7 +103,7 @@ jobs:
103103
)
104104
steps:
105105
- name: Dispatch workflow run
106-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
106+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
107107
with:
108108
retries: 2
109109
retry-exempt-status-codes: 418

‎.github/workflows/failed-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Rerun a workflow
33-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
33+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
3434
with:
3535
retries: 15
3636
retry-exempt-status-codes: 418

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Confirms that installing WordPress using WP-CLI works successfully.
22
#
33
# This workflow is not meant to test wordpress-develop checkouts, but rather tagged versions officially available on WordPress.org.
4+
#
5+
# This workflow is triggered for all WordPress versions that are currently receiving security updates. It therefore needs to
6+
# retain support for older PHP and database versions.
47
name: Installation Tests
58

69
on:
@@ -95,11 +98,12 @@ jobs:
9598
- db-version: '9.1'
9699
- db-version: '9.2'
97100
- db-version: '9.3'
101+
- db-version: '9.4'
98102
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
99103
- php: '7.2'
100-
db-version: '9.4'
104+
db-version: '9.5'
101105
- php: '7.3'
102-
db-version: '9.4'
106+
db-version: '9.5'
103107

104108
services:
105109
database:
@@ -118,7 +122,7 @@ jobs:
118122
119123
steps:
120124
- name: Set up PHP ${{ matrix.php }}
121-
uses: shivammathur/setup-php@20529878ed81ef8e78ddf08b480401e6101a850f # v2.35.3
125+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
122126
with:
123127
php-version: '${{ matrix.php }}'
124128
coverage: none
@@ -171,7 +175,7 @@ jobs:
171175
172176
steps:
173177
- name: Dispatch workflow run
174-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
178+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
175179
with:
176180
retries: 2
177181
retry-exempt-status-codes: 418

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ on:
88
- '3.[89]'
99
- '[4-9].[0-9]'
1010
tags:
11-
- '[0-9]+.[0-9]'
12-
- '[0-9]+.[0-9].[0-9]+'
13-
- '!3.7.[0-9]+'
11+
- '3.[89]'
12+
- '3.[89].[0-9]+'
13+
- '[4-9].[0-9]'
14+
- '[4-9].[0-9].[0-9]+'
1415
pull_request:
1516
branches:
1617
- trunk
@@ -91,7 +92,7 @@ jobs:
9192
9293
steps:
9394
- name: Dispatch workflow run
94-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
95+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
9596
with:
9697
retries: 2
9798
retry-exempt-status-codes: 418

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Local Docker Environment
22

33
on:
4+
# Local Docker environment testing was introduced in WordPress 6.8.
45
push:
56
branches:
67
- trunk
@@ -104,11 +105,7 @@ jobs:
104105
- db-version: '9.1'
105106
- db-version: '9.2'
106107
- db-version: '9.3'
107-
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
108-
- php: '7.2'
109-
db-version: '9.4'
110-
- php: '7.3'
111-
db-version: '9.4'
108+
- db-version: '9.4'
112109
# No PHP 8.5 + Memcached support yet.
113110
- php: '8.5'
114111
memcached: true
@@ -154,7 +151,7 @@ jobs:
154151
155152
steps:
156153
- name: Dispatch workflow run
157-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
154+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
158155
with:
159156
retries: 2
160157
retry-exempt-status-codes: 418

‎.github/workflows/performance.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
name: Performance Tests
22

33
on:
4+
# Performance testing was introduced in WordPress 6.2.
45
push:
56
branches:
67
- trunk
78
- '6.[2-9]'
89
- '[7-9].[0-9]'
910
tags:
10-
- '[0-9]+.[0-9]'
11-
- '[0-9]+.[0-9].[0-9]+'
12-
- '![45].[0-9].[0-9]+'
13-
- '!6.[01].[0-9]+'
11+
- '6.[2-9]'
12+
- '6.[2-9].[0-9]+'
13+
- '[7-9].[0-9]'
14+
- '[7-9].[0-9].[0-9]+'
1415
pull_request:
1516
branches:
1617
- trunk
@@ -68,7 +69,7 @@ jobs:
6869
run: echo "TARGET_SHA=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV"
6970

7071
- name: Set subjects
71-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
72+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
7273
id: set-subjects
7374
with:
7475
script: |
@@ -165,7 +166,7 @@ jobs:
165166
166167
steps:
167168
- name: Dispatch workflow run
168-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
169+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
169170
with:
170171
retries: 2
171172
retry-exempt-status-codes: 418

0 commit comments

Comments
 (0)