Skip to content

Commit 2385f89

Browse files
authored
Merge branch 'WordPress:trunk' into trunk
2 parents e9194ff + 5d466a4 commit 2385f89

192 files changed

Lines changed: 27076 additions & 19737 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.

.github/workflows/coding-standards.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070

7171
steps:
7272
- name: Checkout repository
73-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
73+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
7474

7575
- name: Set up PHP
7676
uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # v2.24.0
@@ -145,7 +145,7 @@ jobs:
145145

146146
steps:
147147
- name: Checkout repository
148-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
148+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
149149

150150
- name: Set up Node.js
151151
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
@@ -203,7 +203,7 @@ jobs:
203203
204204
steps:
205205
- name: Dispatch workflow run
206-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
206+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
207207
with:
208208
retries: 2
209209
retry-exempt-status-codes: 418

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

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
6969
7070
- name: Checkout repository
71-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
71+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
7272

7373
- name: Set up Node.js
7474
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
@@ -126,3 +126,34 @@ jobs:
126126

127127
- name: Ensure version-controlled files are not modified or deleted
128128
run: git diff --exit-code
129+
130+
failed-workflow:
131+
name: Failed workflow tasks
132+
runs-on: ubuntu-latest
133+
permissions:
134+
actions: write
135+
needs: [ e2e-tests ]
136+
if: |
137+
always() &&
138+
github.repository == 'WordPress/wordpress-develop' &&
139+
github.event_name != 'pull_request' &&
140+
github.run_attempt < 2 &&
141+
(
142+
needs.e2e-tests.result == 'cancelled' || needs.e2e-tests.result == 'failure'
143+
)
144+
steps:
145+
- name: Dispatch workflow run
146+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
147+
with:
148+
retries: 2
149+
retry-exempt-status-codes: 418
150+
script: |
151+
github.rest.actions.createWorkflowDispatch({
152+
owner: context.repo.owner,
153+
repo: context.repo.repo,
154+
workflow_id: 'failed-workflow.yml',
155+
ref: 'trunk',
156+
inputs: {
157+
run_id: '${{ github.run_id }}'
158+
}
159+
});

.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@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
33+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
3434
with:
3535
retries: 2
3636
retry-exempt-status-codes: 418

.github/workflows/javascript-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262

6363
steps:
6464
- name: Checkout repository
65-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
65+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
6666

6767
- name: Set up Node.js
6868
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
@@ -107,7 +107,7 @@ jobs:
107107
runs-on: ubuntu-latest
108108
permissions:
109109
actions: write
110-
needs: [ test-js, slack-notifications ]
110+
needs: [ slack-notifications ]
111111
if: |
112112
always() &&
113113
github.repository == 'WordPress/wordpress-develop' &&
@@ -119,7 +119,7 @@ jobs:
119119
120120
steps:
121121
- name: Dispatch workflow run
122-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
122+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
123123
with:
124124
retries: 2
125125
retry-exempt-status-codes: 418

.github/workflows/performance.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ concurrency:
3030
permissions: {}
3131

3232
env:
33+
# Performance testing should be performed in an environment reflecting a standard production environment.
34+
WP_DEBUG: false
35+
SCRIPT_DEBUG: false
36+
SAVEQUERIES : false
37+
WP_DEVELOPMENT_MODE: ''
38+
3339
# This workflow takes two sets of measurements — one for the current commit,
3440
# and another against a consistent version that is used as a baseline measurement.
3541
# This is done to isolate variance in measurements caused by the GitHub runners
@@ -81,7 +87,7 @@ jobs:
8187
echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
8288
8389
- name: Checkout repository
84-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
90+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
8591

8692
- name: Set up Node.js
8793
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
@@ -162,7 +168,7 @@ jobs:
162168
- name: Set the base sha
163169
# Only needed when publishing results.
164170
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
165-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
171+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
166172
id: base-sha
167173
with:
168174
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -173,7 +179,7 @@ jobs:
173179
- name: Set commit details
174180
# Only needed when publishing results.
175181
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
176-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
182+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
177183
id: commit-timestamp
178184
with:
179185
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -215,7 +221,7 @@ jobs:
215221
runs-on: ubuntu-latest
216222
permissions:
217223
actions: write
218-
needs: [ performance, slack-notifications ]
224+
needs: [ slack-notifications ]
219225
if: |
220226
always() &&
221227
github.repository == 'WordPress/wordpress-develop' &&
@@ -227,7 +233,7 @@ jobs:
227233
228234
steps:
229235
- name: Dispatch workflow run
230-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
236+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
231237
with:
232238
retries: 2
233239
retry-exempt-status-codes: 418

.github/workflows/php-compatibility.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565

6666
steps:
6767
- name: Checkout repository
68-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
68+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
6969

7070
- name: Set up PHP
7171
uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # v2.24.0
@@ -132,7 +132,7 @@ jobs:
132132
runs-on: ubuntu-latest
133133
permissions:
134134
actions: write
135-
needs: [ php-compatibility, slack-notifications ]
135+
needs: [ slack-notifications ]
136136
if: |
137137
always() &&
138138
github.repository == 'WordPress/wordpress-develop' &&
@@ -144,7 +144,7 @@ jobs:
144144
145145
steps:
146146
- name: Dispatch workflow run
147-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
147+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
148148
with:
149149
retries: 2
150150
retry-exempt-status-codes: 418

.github/workflows/phpunit-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
9898
9999
- name: Checkout repository
100-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
100+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
101101

102102
- name: Set up Node.js
103103
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
@@ -184,7 +184,7 @@ jobs:
184184

185185
- name: Checkout the WordPress Test Reporter
186186
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }}
187-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
187+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
188188
with:
189189
repository: 'WordPress/phpunit-test-runner'
190190
path: 'test-runner'
@@ -216,7 +216,7 @@ jobs:
216216
runs-on: ubuntu-latest
217217
permissions:
218218
actions: write
219-
needs: [ test-php, slack-notifications ]
219+
needs: [ slack-notifications ]
220220
if: |
221221
always() &&
222222
github.repository == 'WordPress/wordpress-develop' &&
@@ -228,7 +228,7 @@ jobs:
228228
229229
steps:
230230
- name: Dispatch workflow run
231-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
231+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
232232
with:
233233
retries: 2
234234
retry-exempt-status-codes: 418

.github/workflows/slack-notifications.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
steps:
6161
- name: Determine the status of the previous attempt
6262
id: previous-attempt-result
63-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
63+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
6464
with:
6565
retries: 2
6666
retry-exempt-status-codes: 418
@@ -125,7 +125,7 @@ jobs:
125125

126126
- name: Get the commit message
127127
id: current-commit-message
128-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
128+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
129129
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
130130
with:
131131
retries: 2

.github/workflows/test-and-zip-default-themes.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979

8080
steps:
8181
- name: Checkout repository
82-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
82+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
8383
with:
8484
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.branch || github.ref }}
8585

@@ -133,7 +133,7 @@ jobs:
133133

134134
steps:
135135
- name: Checkout repository
136-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
136+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
137137
with:
138138
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.branch || github.ref }}
139139

@@ -165,7 +165,7 @@ jobs:
165165
runs-on: ubuntu-latest
166166
permissions:
167167
actions: write
168-
needs: [ test-build-scripts, bundle-theme, slack-notifications ]
168+
needs: [ slack-notifications ]
169169
if: |
170170
always() &&
171171
github.repository == 'WordPress/wordpress-develop' &&
@@ -178,7 +178,7 @@ jobs:
178178
179179
steps:
180180
- name: Dispatch workflow run
181-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
181+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
182182
with:
183183
retries: 2
184184
retry-exempt-status-codes: 418

.github/workflows/test-coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
7777
7878
- name: Checkout repository
79-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
79+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
8080

8181
- name: Set up Node.js
8282
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
@@ -193,7 +193,7 @@ jobs:
193193
runs-on: ubuntu-latest
194194
permissions:
195195
actions: write
196-
needs: [ test-coverage-report, slack-notifications ]
196+
needs: [ slack-notifications ]
197197
if: |
198198
always() &&
199199
github.repository == 'WordPress/wordpress-develop' &&
@@ -205,7 +205,7 @@ jobs:
205205
206206
steps:
207207
- name: Dispatch workflow run
208-
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
208+
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
209209
with:
210210
retries: 2
211211
retry-exempt-status-codes: 418

0 commit comments

Comments
 (0)