Skip to content

Commit 51960f3

Browse files
authored
Merge branch 'trunk' into feature/toolbar-toggle-shortcut
2 parents 0acc2d5 + 74c99a3 commit 51960f3

File tree

842 files changed

+64395
-7944
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

842 files changed

+64395
-7944
lines changed

.github/pull_request_template.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ Trac ticket: <!-- insert a link to the WordPress Trac ticket here -->
2323

2424
<!--
2525
You are free to use artificial intelligence (AI) tooling to contribute, but you must disclose what tooling you are using and to what extent a pull request has been authored by AI. It is your responsibility to review and take responsibility for what AI generates. See the WordPress AI Guidelines: <https://make.wordpress.org/ai/handbook/ai-guidelines/>.
26+
27+
Example disclosure:
28+
29+
AI assistance: Yes
30+
Tool(s): GitHub Copilot, ChatGPT
31+
Model(s): GPT-5.1
32+
Used for: Initial code skeleton and test suggestions; final implementation and tests were reviewed and edited by me.
2633
-->
2734

2835
---

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@ on:
2323
- '.nvmrc'
2424
- 'Gruntfile.js'
2525
- 'webpack.config.js'
26+
- 'tools/gutenberg/**'
27+
- 'tools/vendors/**'
2628
- 'tools/webpack/**'
2729
# These files configure Composer. Changes could affect the outcome.
2830
- 'composer.*'
2931
# Confirm any changes to relevant workflow files.
3032
- '.github/workflows/check-built-files.yml'
33+
- '.github/workflows/reusable-check-built-files.yml'
3134
# Changes to the default themes should be handled by the themes workflows.
3235
- '!src/wp-content/themes/twenty**'
3336

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ on:
2828
- '.nvmrc'
2929
- 'Gruntfile.js'
3030
- 'webpack.config.js'
31+
- 'tools/gutenberg/**'
32+
- 'tools/vendors/**'
3133
- 'tools/webpack/**'
3234
# These files configure Composer. Changes could affect the outcome.
3335
- 'composer.*'

.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

.github/workflows/javascript-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ on:
2626
- '.nvmrc'
2727
- 'Gruntfile.js'
2828
- 'webpack.config.js'
29+
- 'tools/gutenberg/**'
30+
- 'tools/vendors/**'
2931
- 'tools/webpack/**'
3032
# This file configures ESLint. Changes could affect the outcome.
3133
- '.eslintignore'

.github/workflows/javascript-type-checking.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ on:
2121
# These files configure npm. Changes could affect the outcome.
2222
- 'package*.json'
2323
- '.nvmrc'
24+
- '.npmrc'
2425
# This file configures TypeScript. Changes could affect the outcome.
2526
- 'tsconfig.json'
2627
# This directory contains TypeScript definitions. Changes could affect the outcome.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717
- 'package*.json'
1818
- 'Gruntfile.js'
1919
- 'webpack.config.js'
20+
- 'tools/gutenberg/**'
21+
- 'tools/vendors/**'
2022
- 'tools/webpack/**'
2123
- '.npmrc'
2224
- '.nvmrc'
@@ -106,6 +108,7 @@ jobs:
106108
- db-version: '9.2'
107109
- db-version: '9.3'
108110
- db-version: '9.4'
111+
- db-version: '9.5'
109112
# No PHP 8.5 + Memcached support yet.
110113
- php: '8.5'
111114
memcached: true

.github/workflows/performance.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ on:
2828
- '.nvmrc'
2929
- 'Gruntfile.js'
3030
- 'webpack.config.js'
31+
- 'tools/gutenberg/**'
32+
- 'tools/vendors/**'
3133
- 'tools/webpack/**'
3234
# These files configure Composer. Changes could affect the outcome.
3335
- 'composer.*'

.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

0 commit comments

Comments
 (0)