Skip to content

Commit 560b979

Browse files
committed
Merge remote-tracking branch 'upstream/trunk' into add/grunt-clean-gutenberg
2 parents 91d9770 + 58ecd43 commit 560b979

275 files changed

Lines changed: 10600 additions & 9421 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/install-testing.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,18 @@ jobs:
8888
- db-version: '5.0'
8989
- db-version: '5.1'
9090
- db-version: '5.5'
91-
# The PHP <= 7.3/MySQL 8.4 jobs currently fail due to mysql_native_password being disabled by default. See https://core.trac.wordpress.org/ticket/61218.
92-
- php: '7.2'
93-
db-version: '8.4'
94-
- php: '7.3'
95-
db-version: '8.4'
9691
# Only test the latest innovation release.
9792
- db-version: '9.0'
9893
- db-version: '9.1'
9994
- db-version: '9.2'
10095
- db-version: '9.3'
10196
- db-version: '9.4'
97+
- db-version: '9.5'
10298
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
10399
- php: '7.2'
104-
db-version: '9.5'
100+
db-version: '9.6'
105101
- php: '7.3'
106-
db-version: '9.5'
102+
db-version: '9.6'
107103

108104
services:
109105
database:
@@ -118,11 +114,11 @@ jobs:
118114
-e MYSQL_ROOT_PASSWORD="root"
119115
-e MYSQL_DATABASE="test_db"
120116
--entrypoint sh ${{ matrix.db-type }}:${{ matrix.db-version }}
121-
-c "exec docker-entrypoint.sh mysqld${{ matrix.db-type == 'mysql' && contains( fromJSON('["7.2", "7.3"]'), matrix.php ) && ' --default-authentication-plugin=mysql_native_password' || '' }}"
117+
-c "exec docker-entrypoint.sh mysqld${{ matrix.db-type == 'mysql' && contains( fromJSON('["5.4", "5.5", "5.6", "7.0", "7.1", "7.2", "7.3"]'), matrix.php ) && ( matrix.db-version == '8.4' && ' --mysql-native-password=ON --authentication-policy=mysql_native_password' || ' --default-authentication-plugin=mysql_native_password' ) || '' }}"
122118
123119
steps:
124120
- name: Set up PHP ${{ matrix.php }}
125-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
121+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
126122
with:
127123
php-version: '${{ matrix.php }}'
128124
coverage: none
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: JavaScript Type Checking
2+
3+
on:
4+
# JavaScript type checking was introduced in 7.0.0.
5+
push:
6+
branches:
7+
- trunk
8+
- '[7-9].[0-9]'
9+
tags:
10+
- '[7-9].[0-9]'
11+
- '[7-9]+.[0-9].[0-9]+'
12+
pull_request:
13+
branches:
14+
- trunk
15+
- '[7-9].[0-9]'
16+
paths:
17+
# This workflow only scans JavaScript files.
18+
- '**.js'
19+
- '**.ts'
20+
- '**.tsx'
21+
# These files configure npm. Changes could affect the outcome.
22+
- 'package*.json'
23+
- '.nvmrc'
24+
# This file configures TypeScript. Changes could affect the outcome.
25+
- 'tsconfig.json'
26+
# This directory contains TypeScript definitions. Changes could affect the outcome.
27+
- 'typings/**'
28+
# Confirm any changes to relevant workflow files.
29+
- '.github/workflows/javascript-type-checking.yml'
30+
- '.github/workflows/reusable-javascript-type-checking-v1.yml'
31+
workflow_dispatch:
32+
33+
# Cancels all previous workflow runs for pull requests that have not completed.
34+
concurrency:
35+
# The concurrency group contains the workflow name and the branch name for pull requests
36+
# or the commit hash for any other events.
37+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
38+
cancel-in-progress: true
39+
40+
# Disable permissions for all available scopes by default.
41+
# Any needed permissions should be configured at the job level.
42+
permissions: {}
43+
44+
jobs:
45+
# Runs JavaScript type checking.
46+
typecheck:
47+
name: JavaScript type checking
48+
uses: ./.github/workflows/reusable-javascript-type-checking-v1.yml
49+
permissions:
50+
contents: read
51+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
52+
53+
slack-notifications:
54+
name: Slack Notifications
55+
uses: ./.github/workflows/slack-notifications.yml
56+
permissions:
57+
actions: read
58+
contents: read
59+
needs: [ typecheck ]
60+
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
61+
with:
62+
calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}
63+
secrets:
64+
SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
65+
SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
66+
SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
67+
SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
68+
69+
failed-workflow:
70+
name: Failed workflow tasks
71+
runs-on: ubuntu-24.04
72+
permissions:
73+
actions: write
74+
needs: [ slack-notifications ]
75+
if: |
76+
always() &&
77+
github.repository == 'WordPress/wordpress-develop' &&
78+
github.event_name != 'pull_request' &&
79+
github.run_attempt < 2 &&
80+
(
81+
contains( needs.*.result, 'cancelled' ) ||
82+
contains( needs.*.result, 'failure' )
83+
)
84+
85+
steps:
86+
- name: Dispatch workflow run
87+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
88+
with:
89+
retries: 2
90+
retry-exempt-status-codes: 418
91+
script: |
92+
github.rest.actions.createWorkflowDispatch({
93+
owner: context.repo.owner,
94+
repo: context.repo.repo,
95+
workflow_id: 'failed-workflow.yml',
96+
ref: 'trunk',
97+
inputs: {
98+
run_id: `${context.runId}`,
99+
}
100+
});

.github/workflows/phpstan-static-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
- 'tests/phpstan/baseline.php'
2525
# Confirm any changes to relevant workflow files.
2626
- '.github/workflows/phpstan-static-analysis.yml'
27-
- '.github/workflows/reusable-phpstan-static-analysis.yml'
27+
- '.github/workflows/reusable-phpstan-static-analysis-v1.yml'
2828
workflow_dispatch:
2929

3030
# Cancels all previous workflow runs for pull requests that have not completed.
@@ -42,10 +42,10 @@ jobs:
4242
# Runs PHPStan Static Analysis.
4343
phpstan:
4444
name: PHP static analysis
45-
uses: ./.github/workflows/reusable-phpstan-static-analysis.yml
45+
uses: ./.github/workflows/reusable-phpstan-static-analysis-v1.yml
4646
permissions:
4747
contents: read
48-
if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
48+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
4949

5050
slack-notifications:
5151
name: Slack Notifications
@@ -81,7 +81,7 @@ jobs:
8181
8282
steps:
8383
- name: Dispatch workflow run
84-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
84+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
8585
with:
8686
retries: 2
8787
retry-exempt-status-codes: 418

.github/workflows/phpunit-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,17 +203,17 @@ jobs:
203203
os: [ ubuntu-24.04 ]
204204
php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
205205
db-type: [ 'mysql', 'mariadb' ]
206-
db-version: [ '9.5', '12.0' ]
206+
db-version: [ '9.6', '12.1' ]
207207
multisite: [ false, true ]
208208
memcached: [ false ]
209209
db-innovation: [ true ]
210210

211211
exclude:
212212
# Exclude version combinations that don't exist.
213213
- db-type: 'mariadb'
214-
db-version: '9.5'
214+
db-version: '9.6'
215215
- db-type: 'mysql'
216-
db-version: '12.0'
216+
db-version: '12.1'
217217
with:
218218
os: ${{ matrix.os }}
219219
php: ${{ matrix.php }}

.github/workflows/reusable-build-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
persist-credentials: false
3636

3737
- name: Set up Node.js
38-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
38+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
3939
with:
4040
node-version-file: '.nvmrc'
4141
cache: npm
@@ -53,7 +53,7 @@ jobs:
5353
run: zip -q -r develop.zip wordpress/.
5454

5555
- name: Upload ZIP as a GitHub Actions artifact
56-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
56+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5757
with:
5858
name: wordpress-develop
5959
path: develop.zip

.github/workflows/reusable-check-built-files.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
4343

4444
- name: Set up Node.js
45-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
45+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
4646
with:
4747
node-version-file: '.nvmrc'
4848
cache: npm
@@ -56,7 +56,7 @@ jobs:
5656
# Since Composer dependencies are installed using `composer update` and no lock file is in version control,
5757
# passing a custom cache suffix ensures that the cache is flushed at least once per week.
5858
- name: Install Composer dependencies
59-
uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # v3.1.1
59+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v4.0.0
6060
with:
6161
custom-cache-suffix: ${{ steps.get-date.outputs.date }}
6262

@@ -103,7 +103,7 @@ jobs:
103103

104104
# Uploads the diff file as an artifact.
105105
- name: Upload diff file as artifact
106-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
106+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
107107
if: ${{ steps.built-file-check.outputs.uncommitted_changes == 'true' }}
108108
with:
109109
name: pr-built-file-changes

.github/workflows/reusable-coding-standards-javascript.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
persist-credentials: false
4141

4242
- name: Set up Node.js
43-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
43+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
4444
with:
4545
node-version-file: '.nvmrc'
4646
cache: npm

.github/workflows/reusable-coding-standards-php.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
persist-credentials: false
5353

5454
- name: Set up PHP
55-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
55+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
5656
with:
5757
php-version: ${{ inputs.php-version }}
5858
coverage: none
@@ -75,7 +75,7 @@ jobs:
7575
# Since Composer dependencies are installed using `composer update` and no lock file is in version control,
7676
# passing a custom cache suffix ensures that the cache is flushed at least once per week.
7777
- name: Install Composer dependencies
78-
uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # v3.1.1
78+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v4.0.0
7979
with:
8080
custom-cache-suffix: ${{ steps.get-date.outputs.date }}
8181

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
persist-credentials: false
8383

8484
- name: Set up Node.js
85-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
85+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
8686
with:
8787
node-version-file: '.nvmrc'
8888
cache: npm
@@ -100,7 +100,7 @@ jobs:
100100

101101
- name: Install Playwright browsers
102102
if: ${{ inputs.install-playwright }}
103-
run: npx playwright install --with-deps
103+
run: npx playwright install --with-deps chromium
104104

105105
- name: Build WordPress
106106
run: npm run build
@@ -145,7 +145,7 @@ jobs:
145145
run: npm run test:e2e
146146

147147
- name: Archive debug artifacts (screenshots, HTML snapshots)
148-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
148+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
149149
if: always()
150150
with:
151151
name: failures-artifacts${{ inputs.LOCAL_SCRIPT_DEBUG && '-SCRIPT_DEBUG' || '' }}-${{ github.run_id }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
persist-credentials: false
4242

4343
- name: Set up Node.js
44-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
44+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
4545
with:
4646
node-version-file: '.nvmrc'
4747
cache: npm

0 commit comments

Comments
 (0)