Skip to content

Commit 4b01d66

Browse files
rdelbemrdelbem
authored
Merge branch 'trunk' into ticket/61996-fix-slug-conflict
2 parents cc8e0c4 + b3b40be commit 4b01d66

102 files changed

Lines changed: 2532 additions & 724 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/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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ permissions: {}
5353

5454
env:
5555
LOCAL_DIR: build
56-
PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
56+
PUPPETEER_SKIP_DOWNLOAD: true
5757

5858
jobs:
5959
# 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/local-docker-environment.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ jobs:
7979
uses: ./.github/workflows/reusable-support-json-reader-v1.yml
8080
permissions:
8181
contents: read
82-
secrets: inherit
8382
if: ${{ github.repository == 'WordPress/wordpress-develop' }}
8483
with:
8584
wp-version: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }}

‎.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

‎.github/workflows/reusable-cleanup-pull-requests.yml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# - Parse fixed ticket numbers from the commit message.
2020
# - Parse the SVN revision from the commit message.
2121
# - Searches for pull requests referencing any fixed tickets.
22-
# - Leaves a comment on each PR before closing.
22+
# - Comments on pull requests referencing any fixed tickets before closing.
2323
close-prs:
2424
name: Find and close PRs
2525
runs-on: ubuntu-24.04
@@ -43,13 +43,17 @@ jobs:
4343
COMMIT_MESSAGE="$(echo "$COMMIT_MSG_RAW" | sed -n '$p')"
4444
echo "svn_revision_number=$(echo "$COMMIT_MESSAGE" | sed -n 's/.*git-svn-id: https:\/\/develop.svn.wordpress.org\/[^@]*@\([0-9]*\) .*/\1/p')" >> "$GITHUB_OUTPUT"
4545
46-
- name: Find pull requests
47-
id: linked-prs
46+
- name: Find, comment on, and close pull requests
4847
if: ${{ steps.trac-tickets.outputs.fixed_list != '' && steps.git-svn-id.outputs.svn_revision_number != '' }}
4948
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
49+
env:
50+
FIXED_LIST: ${{ steps.trac-tickets.outputs.fixed_list }}
51+
SVN_REVISION_NUMBER: ${{ steps.git-svn-id.outputs.svn_revision_number }}
5052
with:
5153
script: |
52-
const fixedList = "${{ steps.trac-tickets.outputs.fixed_list }}".split(' ').filter(Boolean);
54+
const fixedList = process.env.FIXED_LIST.split(' ').filter(Boolean);
55+
const svnRevisionNumber = process.env.SVN_REVISION_NUMBER;
56+
const githubSha = process.env.GITHUB_SHA;
5357
let prNumbers = [];
5458
5559
for (const ticket of fixedList) {
@@ -86,19 +90,10 @@ jobs:
8690
prNumbers.push(...matchingPRs);
8791
}
8892
89-
return prNumbers;
90-
91-
- name: Comment and close pull requests
92-
if: ${{ steps.trac-tickets.outputs.fixed_list != '' && steps.git-svn-id.outputs.svn_revision_number != '' }}
93-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
94-
with:
95-
script: |
96-
const prNumbers = ${{ steps.linked-prs.outputs.result }};
97-
9893
const commentBody = `A commit was made that fixes the Trac ticket referenced in the description of this pull request.
9994
100-
SVN changeset: [${{ steps.git-svn-id.outputs.svn_revision_number }}](https://core.trac.wordpress.org/changeset/${{ steps.git-svn-id.outputs.svn_revision_number }})
101-
GitHub commit: https://github.com/WordPress/wordpress-develop/commit/${{ github.sha }}
95+
SVN changeset: [${svnRevisionNumber}](https://core.trac.wordpress.org/changeset/${svnRevisionNumber})
96+
GitHub commit: https://github.com/WordPress/wordpress-develop/commit/${githubSha}
10297
10398
This PR will be closed, but please confirm the accuracy of this and reopen if there is more work to be done.`;
10499

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
workflow_call:
88

99
env:
10-
PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
10+
PUPPETEER_SKIP_DOWNLOAD: true
1111

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

‎.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@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
55+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.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@65e4f84970763564f46a70b8a54b90d033b3bdda # v4.0.0
78+
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
7979
with:
8080
custom-cache-suffix: ${{ steps.get-date.outputs.date }}
8181

‎.github/workflows/reusable-performance-test-v2.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ on:
4949
required: false
5050

5151
env:
52-
PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
52+
PUPPETEER_SKIP_DOWNLOAD: true
5353

5454
# Prevent wp-scripts from downloading extra Playwright browsers,
5555
# since Chromium will be installed in its dedicated step already.

0 commit comments

Comments
 (0)
⚡