Skip to content

Commit 77bf2b7

Browse files
committed
Merge remote-tracking branch 'upstream/trunk' into add/mariadb-11-4
2 parents 5867223 + 8eaaf53 commit 77bf2b7

37 files changed

+1171
-486
lines changed

.github/workflows/performance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: WordPress/wordpress-develop/.github/workflows/reusable-performance.yml@trunk
3737
permissions:
3838
contents: read
39-
if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ! contains( github.event.before, '00000000' ) }}
39+
if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
4040
strategy:
4141
fail-fast: false
4242
matrix:

.github/workflows/reusable-performance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
runs-on: ubuntu-latest
103103
permissions:
104104
contents: read
105-
if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ! contains( github.event.before, '00000000' ) }}
105+
if: ${{ ! contains( github.event.before, '00000000' ) }}
106106

107107
steps:
108108
- name: Configure environment variables

.github/workflows/reusable-phpunit-tests-v3.yml

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

213213
- name: Upload test coverage report to Codecov
214214
if: ${{ inputs.coverage-report }}
215-
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
215+
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
216216
with:
217217
token: ${{ secrets.CODECOV_TOKEN }}
218218
file: wp-code-coverage${{ inputs.multisite && '-multisite' || '-single' }}-${{ github.sha }}.xml
@@ -231,15 +231,15 @@ jobs:
231231
run: git diff --exit-code
232232

233233
- name: Checkout the WordPress Test Reporter
234-
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && inputs.report }}
234+
if: ${{ github.ref == 'refs/heads/trunk' && inputs.report }}
235235
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
236236
with:
237237
repository: 'WordPress/phpunit-test-runner'
238238
path: 'test-runner'
239239
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
240240

241241
- name: Submit test results to the WordPress.org host test results
242-
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && inputs.report }}
242+
if: ${{ github.ref == 'refs/heads/trunk' && inputs.report }}
243243
env:
244244
WPT_REPORT_API_KEY: "${{ secrets.WPT_REPORT_API_KEY }}"
245245
run: docker compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php

.github/workflows/reusable-support-json-reader-v1.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
major-wp-version:
3838
name: Determine major WordPress version
3939
runs-on: ubuntu-latest
40-
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
4140
timeout-minutes: 5
4241
outputs:
4342
version: ${{ steps.major-wp-version.outputs.version }}
@@ -69,7 +68,6 @@ jobs:
6968
php-versions:
7069
name: Determine PHP versions
7170
runs-on: ubuntu-latest
72-
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
7371
needs: [ major-wp-version ]
7472
timeout-minutes: 5
7573
outputs:
@@ -102,7 +100,6 @@ jobs:
102100
mysql-versions:
103101
name: Determine MySQL versions
104102
runs-on: ubuntu-latest
105-
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
106103
needs: [ major-wp-version ]
107104
timeout-minutes: 5
108105
outputs:

.github/workflows/slack-notifications.yml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -161,66 +161,62 @@ jobs:
161161
failure:
162162
name: Failure notifications
163163
runs-on: ubuntu-latest
164-
continue-on-error: true
165-
timeout-minutes: 5
164+
timeout-minutes: 10
166165
needs: [ prepare ]
167166
if: ${{ needs.prepare.outputs.previous_conclusion != 'first-failure' && inputs.calling_status == 'failure' || failure() }}
168167

169168
steps:
170169
- name: Post failure notifications to Slack
171-
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
170+
uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
172171
with:
172+
webhook-type: webhook-trigger
173+
webhook: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
173174
payload: ${{ needs.prepare.outputs.payload }}
174-
env:
175-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
176175

177176
# Posts notifications the first time a workflow run succeeds after previously failing.
178177
fixed:
179178
name: Fixed notifications
180179
runs-on: ubuntu-latest
181-
continue-on-error: true
182-
timeout-minutes: 5
180+
timeout-minutes: 10
183181
needs: [ prepare ]
184182
if: ${{ contains( fromJson( '["failure", "cancelled", "none"]' ), needs.prepare.outputs.previous_conclusion ) && inputs.calling_status == 'success' && success() }}
185183

186184
steps:
187185
- name: Post failure notifications to Slack
188-
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
186+
uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
189187
with:
188+
webhook-type: webhook-trigger
189+
webhook: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
190190
payload: ${{ needs.prepare.outputs.payload }}
191-
env:
192-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
193191

194192
# Posts notifications when a workflow is successful.
195193
success:
196194
name: Success notifications
197195
runs-on: ubuntu-latest
198-
continue-on-error: true
199-
timeout-minutes: 5
196+
timeout-minutes: 10
200197
needs: [ prepare ]
201198
if: ${{ inputs.calling_status == 'success' && success() }}
202199

203200
steps:
204201
- name: Post success notifications to Slack
205-
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
202+
uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
206203
with:
204+
webhook-type: webhook-trigger
205+
webhook: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
207206
payload: ${{ needs.prepare.outputs.payload }}
208-
env:
209-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
210207

211208
# Posts notifications when a workflow is cancelled.
212209
cancelled:
213210
name: Cancelled notifications
214211
runs-on: ubuntu-latest
215-
continue-on-error: true
216-
timeout-minutes: 5
212+
timeout-minutes: 10
217213
needs: [ prepare ]
218214
if: ${{ inputs.calling_status == 'cancelled' || cancelled() }}
219215

220216
steps:
221217
- name: Post cancelled notifications to Slack
222-
uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
218+
uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
223219
with:
220+
webhook-type: webhook-trigger
221+
webhook: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
224222
payload: ${{ needs.prepare.outputs.payload }}
225-
env:
226-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
schedule:
1313
- cron: '0 0 1 * *'
1414
- cron: '0 0 15 * *'
15+
workflow_dispatch:
1516

1617
# Disable permissions for all available scopes by default.
1718
# Any needed permissions should be configured at the job level.

0 commit comments

Comments
 (0)