Skip to content

Commit 71a9e8b

Browse files
adamsilversteinadamsilverstein
committed
Merge remote-tracking branch 'origin/trunk' into add/heic-canvas-fallback
# Conflicts: # src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
2 parents bf9f644 + 1701705 commit 71a9e8b

773 files changed

Lines changed: 56516 additions & 3356 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/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/commit-built-file-changes.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,12 @@ jobs:
131131
path: 'pr-repo'
132132
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
133133
token: ${{ env.ACCESS_TOKEN }}
134+
persist-credentials: true
134135

135136
- name: Apply patch
136137
if: ${{ steps.artifact-check.outputs.exists == 'true' }}
137138
working-directory: 'pr-repo'
138-
run: git apply ${{ github.workspace }}/changes.diff
139+
run: git apply "$GITHUB_WORKSPACE/changes.diff"
139140

140141
- name: Display changes to versioned files
141142
if: ${{ steps.artifact-check.outputs.exists == 'true' }}
@@ -149,7 +150,7 @@ jobs:
149150
GH_APP_ID: ${{ secrets.GH_PR_BUILT_FILES_APP_ID }}
150151
run: |
151152
git config user.name "wordpress-develop-pr-bot[bot]"
152-
git config user.email ${{ env.GH_APP_ID }}+wordpress-develop-pr-bot[bot]@users.noreply.github.com
153+
git config user.email "${GH_APP_ID}+wordpress-develop-pr-bot[bot]@users.noreply.github.com"
153154
154155
- name: Stage changes
155156
if: ${{ steps.artifact-check.outputs.exists == 'true' }}

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

Lines changed: 3 additions & 1 deletion
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.*'
@@ -51,7 +53,7 @@ permissions: {}
5153

5254
env:
5355
LOCAL_DIR: build
54-
PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
56+
PUPPETEER_SKIP_DOWNLOAD: true
5557

5658
jobs:
5759
# Runs the end-to-end test suite.

‎.github/workflows/install-testing.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
uses: ./.github/workflows/reusable-support-json-reader-v1.yml
5050
permissions:
5151
contents: read
52-
secrets: inherit
5352
if: ${{ github.repository == 'WordPress/wordpress-develop' }}
5453
with:
5554
wp-version: ${{ inputs.wp-version }}
@@ -118,7 +117,7 @@ jobs:
118117
119118
steps:
120119
- name: Set up PHP ${{ matrix.php }}
121-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
120+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
122121
with:
123122
php-version: '${{ matrix.php }}'
124123
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 & 1 deletion
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'
@@ -77,7 +79,6 @@ jobs:
7779
uses: ./.github/workflows/reusable-support-json-reader-v1.yml
7880
permissions:
7981
contents: read
80-
secrets: inherit
8182
if: ${{ github.repository == 'WordPress/wordpress-develop' }}
8283
with:
8384
wp-version: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }}
@@ -106,6 +107,7 @@ jobs:
106107
- db-version: '9.2'
107108
- db-version: '9.3'
108109
- db-version: '9.4'
110+
- db-version: '9.5'
109111
# No PHP 8.5 + Memcached support yet.
110112
- php: '8.5'
111113
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: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ jobs:
6666
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
6767
permissions:
6868
contents: read
69-
secrets: inherit
69+
secrets:
70+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
71+
WPT_REPORT_API_KEY: ${{ secrets.WPT_REPORT_API_KEY }}
7072
if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
7173
strategy:
7274
fail-fast: false
@@ -143,7 +145,9 @@ jobs:
143145
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
144146
permissions:
145147
contents: read
146-
secrets: inherit
148+
secrets:
149+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
150+
WPT_REPORT_API_KEY: ${{ secrets.WPT_REPORT_API_KEY }}
147151
if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
148152
strategy:
149153
fail-fast: false
@@ -177,7 +181,7 @@ jobs:
177181
multisite: ${{ matrix.multisite }}
178182
memcached: ${{ matrix.memcached }}
179183
phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
180-
report: ${{ false }}
184+
report: false
181185

182186
#
183187
# Creates PHPUnit test jobs to test MariaDB and MySQL innovation releases.
@@ -195,7 +199,9 @@ jobs:
195199
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
196200
permissions:
197201
contents: read
198-
secrets: inherit
202+
secrets:
203+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
204+
WPT_REPORT_API_KEY: ${{ secrets.WPT_REPORT_API_KEY }}
199205
if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
200206
strategy:
201207
fail-fast: false
@@ -223,7 +229,7 @@ jobs:
223229
multisite: ${{ matrix.multisite }}
224230
memcached: ${{ matrix.memcached }}
225231
phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
226-
report: ${{ false }}
232+
report: false
227233

228234
#
229235
# Runs the HTML API test group.
@@ -238,7 +244,9 @@ jobs:
238244
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
239245
permissions:
240246
contents: read
241-
secrets: inherit
247+
secrets:
248+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
249+
WPT_REPORT_API_KEY: ${{ secrets.WPT_REPORT_API_KEY }}
242250
if: ${{ startsWith( github.repository, 'WordPress/' ) && ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) }}
243251
strategy:
244252
fail-fast: false
@@ -267,7 +275,9 @@ jobs:
267275
uses: ./.github/workflows/reusable-phpunit-tests-v3.yml
268276
permissions:
269277
contents: read
270-
secrets: inherit
278+
secrets:
279+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
280+
WPT_REPORT_API_KEY: ${{ secrets.WPT_REPORT_API_KEY }}
271281
if: ${{ ! startsWith( github.repository, 'WordPress/' ) && github.event_name == 'pull_request' }}
272282
strategy:
273283
fail-fast: false

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4141
with:
4242
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
43+
persist-credentials: false
4344

4445
- name: Set up Node.js
4546
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
@@ -56,7 +57,7 @@ jobs:
5657
# Since Composer dependencies are installed using `composer update` and no lock file is in version control,
5758
# passing a custom cache suffix ensures that the cache is flushed at least once per week.
5859
- name: Install Composer dependencies
59-
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v4.0.0
60+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
6061
with:
6162
custom-cache-suffix: ${{ steps.get-date.outputs.date }}
6263

0 commit comments

Comments
 (0)