Skip to content

Commit 16907b7

Browse files
committed
Merge branch 'trunk' into 62622-php-74
# Conflicts: # .github/workflows/local-docker-environment.yml # .github/workflows/phpunit-tests.yml # .github/workflows/upgrade-develop-testing.yml # .github/workflows/upgrade-testing.yml # .version-support-php.json
2 parents 9a245a8 + 65772ac commit 16907b7

769 files changed

Lines changed: 22820 additions & 49330 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
100100
steps:
101101
- name: Dispatch workflow run
102-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
102+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
103103
with:
104104
retries: 2
105105
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,12 @@ jobs:
9898
- db-version: '9.1'
9999
- db-version: '9.2'
100100
- db-version: '9.3'
101+
- db-version: '9.4'
101102
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
102103
- php: '7.2'
103-
db-version: '9.4'
104+
db-version: '9.5'
104105
- php: '7.3'
105-
db-version: '9.4'
106+
db-version: '9.5'
106107

107108
services:
108109
database:
@@ -121,7 +122,7 @@ jobs:
121122
122123
steps:
123124
- name: Set up PHP ${{ matrix.php }}
124-
uses: shivammathur/setup-php@20529878ed81ef8e78ddf08b480401e6101a850f # v2.35.3
125+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
125126
with:
126127
php-version: '${{ matrix.php }}'
127128
coverage: none
@@ -174,7 +175,7 @@ jobs:
174175
175176
steps:
176177
- name: Dispatch workflow run
177-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
178+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
178179
with:
179180
retries: 2
180181
retry-exempt-status-codes: 418

.github/workflows/javascript-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
9393
steps:
9494
- name: Dispatch workflow run
95-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
95+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
9696
with:
9797
retries: 2
9898
retry-exempt-status-codes: 418

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
- db-version: '9.1'
106106
- db-version: '9.2'
107107
- db-version: '9.3'
108+
- db-version: '9.4'
108109
# No PHP 8.5 + Memcached support yet.
109110
- php: '8.5'
110111
memcached: true
@@ -150,7 +151,7 @@ jobs:
150151
151152
steps:
152153
- name: Dispatch workflow run
153-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
154+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
154155
with:
155156
retries: 2
156157
retry-exempt-status-codes: 418

.github/workflows/performance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
run: echo "TARGET_SHA=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV"
7070

7171
- name: Set subjects
72-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
72+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
7373
id: set-subjects
7474
with:
7575
script: |
@@ -166,7 +166,7 @@ jobs:
166166
167167
steps:
168168
- name: Dispatch workflow run
169-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
169+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
170170
with:
171171
retries: 2
172172
retry-exempt-status-codes: 418

0 commit comments

Comments
 (0)