Skip to content

Commit 2cb7d01

Browse files
authored
Merge branch 'WordPress:trunk' into title-attr-author-links-2
2 parents f9759fc + ac057e6 commit 2cb7d01

490 files changed

Lines changed: 23742 additions & 8683 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.

.eslintignore

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
1-
# Files and folders related to build/test tools
1+
# Files and folders related to build/test tools including generated files
22
/build
33
/node_modules
44
/tests
55
/vendor
66
/tools
7+
/jsdoc
8+
/artifacts
9+
/coverage
10+
.cache/*
11+
/src/wp-includes/blocks/**/*.js
12+
/src/wp-includes/blocks/**/*.js.map
13+
/src/wp-admin/js
14+
/src/wp-includes/js
715

816
# Excluded files and folders based on `jsdoc.conf.json` exclusions
917
/src/js/_enqueues/vendor
1018

11-
# Webpack built files
12-
/src/wp-includes/js/media-*
13-
1419
# Themes
15-
src/wp-content/themes/
20+
src/wp-content/themes
21+
22+
# Files and folders that get created in wp-content
23+
/src/wp-content/plugins
24+
/src/wp-content/mu-plugins
25+
/src/wp-content/upgrade
26+
/src/wp-content/uploads

.github/dependabot.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,20 @@ updates:
1212
github-actions:
1313
patterns:
1414
- "*"
15+
16+
# Check for updates to Composer packages.
17+
- package-ecosystem: "composer"
18+
directory: "/"
19+
schedule:
20+
interval: "daily"
21+
open-pull-requests-limit: 10
22+
ignore:
23+
# These dependencies do not currently need to be managed with Dependabot.
24+
- dependency-name: "squizlabs/php_codesniffer"
25+
- dependency-name: "wp-coding-standards/wpcs"
26+
- dependency-name: "phpcompatibility/php-compatibility"
27+
- dependency-name: "yoast/phpunit-polyfills"
28+
groups:
29+
composer-packages:
30+
patterns:
31+
- "composer/ca-bundle"

.github/workflows/coding-standards.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ jobs:
4949
# Runs the PHP coding standards checks.
5050
phpcs:
5151
name: PHP coding standards
52-
uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-php.yml@trunk
52+
uses: ./.github/workflows/reusable-coding-standards-php.yml
5353
permissions:
5454
contents: read
5555
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
5656

5757
# Runs the JavaScript coding standards checks.
5858
jshint:
5959
name: JavaScript coding standards
60-
uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-javascript.yml@trunk
60+
uses: ./.github/workflows/reusable-coding-standards-javascript.yml
6161
permissions:
6262
contents: read
6363
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
6464

6565
slack-notifications:
6666
name: Slack Notifications
67-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
67+
uses: ./.github/workflows/slack-notifications.yml
6868
permissions:
6969
actions: read
7070
contents: read
@@ -80,7 +80,7 @@ jobs:
8080

8181
failed-workflow:
8282
name: Failed workflow tasks
83-
runs-on: ubuntu-latest
83+
runs-on: ubuntu-24.04
8484
permissions:
8585
actions: write
8686
needs: [ phpcs, jshint, slack-notifications ]
@@ -107,6 +107,6 @@ jobs:
107107
workflow_id: 'failed-workflow.yml',
108108
ref: 'trunk',
109109
inputs: {
110-
run_id: '${{ github.run_id }}'
110+
run_id: `${context.runId}`,
111111
}
112112
});

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

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,23 @@ on:
1717
- trunk
1818
- '5.[3-9]'
1919
- '[6-9].[0-9]'
20+
paths:
21+
# Any change to a PHP, CSS, or JavaScript file should run checks.
22+
- '**.css'
23+
- '**.js'
24+
- '**.php'
25+
# These files configure npm and the task runner. Changes could affect the outcome.
26+
- 'package*.json'
27+
- 'Gruntfile.js'
28+
- 'webpack.config.js'
29+
- 'tools/webpack/**'
30+
# These files configure Composer. Changes could affect the outcome.
31+
- 'composer.*'
32+
# This files affect the e2e tests. Changes could affect the outcome.
33+
- 'tests/e2e/**'
34+
# Confirm any changes to relevant workflow files.
35+
- '.github/workflows/end-to-end-tests.yml'
36+
- '.github/workflows/reusable-end-to-end-tests-*.yml'
2037
workflow_dispatch:
2138

2239
# Cancels all previous workflow runs for pull requests that have not completed.
@@ -38,7 +55,7 @@ jobs:
3855
# Runs the end-to-end test suite.
3956
e2e-tests:
4057
name: Test with SCRIPT_DEBUG ${{ matrix.LOCAL_SCRIPT_DEBUG && 'enabled' || 'disabled' }}
41-
uses: WordPress/wordpress-develop/.github/workflows/reusable-end-to-end-tests.yml@trunk
58+
uses: ./.github/workflows/reusable-end-to-end-tests.yml
4259
permissions:
4360
contents: read
4461
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -51,7 +68,7 @@ jobs:
5168

5269
slack-notifications:
5370
name: Slack Notifications
54-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
71+
uses: ./.github/workflows/slack-notifications.yml
5572
permissions:
5673
actions: read
5774
contents: read
@@ -67,7 +84,7 @@ jobs:
6784

6885
failed-workflow:
6986
name: Failed workflow tasks
70-
runs-on: ubuntu-latest
87+
runs-on: ubuntu-24.04
7188
permissions:
7289
actions: write
7390
needs: [ e2e-tests, slack-notifications ]
@@ -93,6 +110,6 @@ jobs:
93110
workflow_id: 'failed-workflow.yml',
94111
ref: 'trunk',
95112
inputs: {
96-
run_id: '${{ github.run_id }}'
113+
run_id: `${context.runId}`,
97114
}
98115
});

.github/workflows/failed-workflow.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
# - Restarts all failed jobs when the workflow fails or is cancelled for the first time.
2424
failed-workflow:
2525
name: Rerun a workflow
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-24.04
2727
permissions:
2828
actions: write
2929
timeout-minutes: 30
@@ -38,7 +38,7 @@ jobs:
3838
const workflow_run = await github.rest.actions.getWorkflowRun({
3939
owner: context.repo.owner,
4040
repo: context.repo.repo,
41-
run_id: ${{ inputs.run_id }},
41+
run_id: process.env.RUN_ID,
4242
});
4343
4444
// Only rerun after the first run attempt.
@@ -49,6 +49,8 @@ jobs:
4949
const rerun = await github.rest.actions.reRunWorkflowFailedJobs({
5050
owner: context.repo.owner,
5151
repo: context.repo.repo,
52-
run_id: ${{ inputs.run_id }},
52+
run_id: process.env.RUN_ID,
5353
enable_debug_logging: true
5454
});
55+
env:
56+
RUN_ID: ${{ inputs.run_id }}

.github/workflows/install-testing.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# Determines the supported values for PHP and database versions based on the WordPress version being tested.
4444
build-test-matrix:
4545
name: Build Test Matrix
46-
uses: WordPress/wordpress-develop/.github/workflows/reusable-support-json-reader-v1.yml@trunk
46+
uses: ./.github/workflows/reusable-support-json-reader-v1.yml
4747
permissions:
4848
contents: read
4949
secrets: inherit
@@ -69,7 +69,7 @@ jobs:
6969
strategy:
7070
fail-fast: false
7171
matrix:
72-
os: [ ubuntu-latest ]
72+
os: [ ubuntu-24.04 ]
7373
php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }}
7474
db-type: [ 'mysql' ]
7575
db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }}
@@ -115,24 +115,28 @@ jobs:
115115
116116
steps:
117117
- name: Set up PHP ${{ matrix.php }}
118-
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
118+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
119119
with:
120120
php-version: '${{ matrix.php }}'
121121
coverage: none
122-
tools: wp-cli${{ contains( fromJSON('["5.4", "5.5"]'), matrix.php ) && ':2.4.0' || '' }}
122+
tools: ${{ contains( fromJSON('["5.4", "5.5"]'), matrix.php ) && 'wp-cli:2.4.0' || 'wp-cli' }}
123123

124124
- name: Download WordPress
125-
run: wp core download ${{ inputs.wp-version && format( '--version={0}', inputs.wp-version ) || '--version=nightly' }}
125+
run: wp core download --version="${WP_VERSION}"
126+
env:
127+
WP_VERSION: ${{ inputs.wp-version || 'nightly' }}
126128

127129
- name: Create wp-config.php file
128-
run: wp config create --dbname=test_db --dbuser=root --dbpass=root --dbhost=127.0.0.1:${{ job.services.database.ports['3306'] }}
130+
run: wp config create --dbname=test_db --dbuser=root --dbpass=root --dbhost="127.0.0.1:${DB_PORT}"
131+
env:
132+
DB_PORT: ${{ job.services.database.ports['3306'] }}
129133

130134
- name: Install WordPress
131-
run: wp core ${{ matrix.multisite && 'multisite-' || '' }}install --url=http://localhost/ --title="Upgrade Test" --admin_user=admin --admin_password=password [email protected] --skip-email
135+
run: wp core ${{ matrix.multisite && 'multisite-install' || 'install' }} --url=http://localhost/ --title="Upgrade Test" --admin_user=admin --admin_password=password [email protected] --skip-email
132136

133137
slack-notifications:
134138
name: Slack Notifications
135-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
139+
uses: ./.github/workflows/slack-notifications.yml
136140
permissions:
137141
actions: read
138142
contents: read
@@ -148,7 +152,7 @@ jobs:
148152

149153
failed-workflow:
150154
name: Failed workflow tasks
151-
runs-on: ubuntu-latest
155+
runs-on: ubuntu-24.04
152156
permissions:
153157
actions: write
154158
needs: [ slack-notifications ]
@@ -175,6 +179,6 @@ jobs:
175179
workflow_id: 'failed-workflow.yml',
176180
ref: 'trunk',
177181
inputs: {
178-
run_id: '${{ github.run_id }}'
182+
run_id: `${context.runId}`,
179183
}
180184
});

.github/workflows/javascript-tests.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ on:
1919
paths:
2020
# Any change to a JavaScript file should run tests.
2121
- '**.js'
22-
# These files configure npm. Changes could affect the outcome.
22+
# These files configure npm and the task runner. Changes could affect the outcome.
2323
- 'package*.json'
24+
- 'Gruntfile.js'
25+
- 'webpack.config.js'
26+
- 'tools/webpack/**'
2427
# This file configures ESLint. Changes could affect the outcome.
2528
- '.eslintignore'
2629
# This file configures JSHint. Changes could affect the outcome.
@@ -47,14 +50,14 @@ jobs:
4750
# Runs the WordPress Core JavaScript tests.
4851
test-js:
4952
name: QUnit Tests
50-
uses: WordPress/wordpress-develop/.github/workflows/reusable-javascript-tests.yml@trunk
53+
uses: ./.github/workflows/reusable-javascript-tests.yml
5154
permissions:
5255
contents: read
5356
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
5457

5558
slack-notifications:
5659
name: Slack Notifications
57-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
60+
uses: ./.github/workflows/slack-notifications.yml
5861
permissions:
5962
actions: read
6063
contents: read
@@ -70,7 +73,7 @@ jobs:
7073

7174
failed-workflow:
7275
name: Failed workflow tasks
73-
runs-on: ubuntu-latest
76+
runs-on: ubuntu-24.04
7477
permissions:
7578
actions: write
7679
needs: [ slack-notifications ]
@@ -97,6 +100,6 @@ jobs:
97100
workflow_id: 'failed-workflow.yml',
98101
ref: 'trunk',
99102
inputs: {
100-
run_id: '${{ github.run_id }}'
103+
run_id: `${context.runId}`,
101104
}
102105
});

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ on:
1212
- 'docker-compose.yml'
1313
# Any changes to local environment related files
1414
- 'tools/local-env/**'
15-
# These files manage packages used by the local environment.
15+
# These files configure npm and the task runner. Changes could affect the outcome.
1616
- 'package*.json'
17+
- 'Gruntfile.js'
18+
- 'webpack.config.js'
19+
- 'tools/webpack/**'
1720
# These files configure Composer. Changes could affect the local environment.
1821
- 'composer.*'
1922
# These files define the versions to test.
@@ -33,8 +36,11 @@ on:
3336
- 'docker-compose.yml'
3437
# Any changes to local environment related files
3538
- 'tools/local-env/**'
36-
# These files manage packages used by the local environment.
39+
# These files configure npm and the task runner. Changes could affect the outcome.
3740
- 'package*.json'
41+
- 'Gruntfile.js'
42+
- 'webpack.config.js'
43+
- 'tools/webpack/**'
3844
# These files configure Composer. Changes could affect the local environment.
3945
- 'composer.*'
4046
# These files define the versions to test.
@@ -63,7 +69,7 @@ jobs:
6369
#
6470
build-test-matrix:
6571
name: Build Test Matrix
66-
uses: WordPress/wordpress-develop/.github/workflows/reusable-support-json-reader-v1.yml@trunk
72+
uses: ./.github/workflows/reusable-support-json-reader-v1.yml
6773
permissions:
6874
contents: read
6975
secrets: inherit
@@ -74,15 +80,15 @@ jobs:
7480
# Tests the local Docker environment.
7581
environment-tests-mysql:
7682
name: PHP ${{ matrix.php }}
77-
uses: WordPress/wordpress-develop/.github/workflows/reusable-test-local-docker-environment-v1.yml@trunk
83+
uses: ./.github/workflows/reusable-test-local-docker-environment-v1.yml
7884
permissions:
7985
contents: read
8086
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
8187
needs: [ build-test-matrix ]
8288
strategy:
8389
fail-fast: false
8490
matrix:
85-
os: [ ubuntu-latest ]
91+
os: [ ubuntu-24.04 ]
8692
memcached: [ false, true ]
8793
php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }}
8894
db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }}
@@ -104,11 +110,10 @@ jobs:
104110
db-type: 'mysql'
105111
db-version: ${{ matrix.db-version }}
106112
memcached: ${{ matrix.memcached }}
107-
tests-domain: ${{ matrix.tests-domain }}
108113

109114
slack-notifications:
110115
name: Slack Notifications
111-
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
116+
uses: ./.github/workflows/slack-notifications.yml
112117
permissions:
113118
actions: read
114119
contents: read
@@ -124,7 +129,7 @@ jobs:
124129

125130
failed-workflow:
126131
name: Failed workflow tasks
127-
runs-on: ubuntu-latest
132+
runs-on: ubuntu-24.04
128133
permissions:
129134
actions: write
130135
needs: [ build-test-matrix, environment-tests-mysql, slack-notifications ]
@@ -151,6 +156,6 @@ jobs:
151156
workflow_id: 'failed-workflow.yml',
152157
ref: 'trunk',
153158
inputs: {
154-
run_id: '${{ github.run_id }}'
159+
run_id: `${context.runId}`,
155160
}
156161
});

0 commit comments

Comments
 (0)