Skip to content

Commit 3f34e28

Browse files
authored
Merge branch 'trunk' into fix/30049
2 parents 81f6961 + 84332c9 commit 3f34e28

File tree

401 files changed

+22607
-9252
lines changed

Some content is hidden

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

401 files changed

+22607
-9252
lines changed

.github/workflows/install-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
142142
steps:
143143
- name: Set up PHP ${{ matrix.php }}
144-
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2.30.0
144+
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
145145
with:
146146
php-version: '${{ matrix.php }}'
147147
coverage: none

.github/workflows/phpunit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
#
3737
test-with-mysql:
3838
name: PHP ${{ matrix.php }}
39-
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests.yml@trunk
39+
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
4040
permissions:
4141
contents: read
4242
secrets: inherit
@@ -108,7 +108,7 @@ jobs:
108108
#
109109
test-with-mariadb:
110110
name: PHP ${{ matrix.php }}
111-
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests.yml@trunk
111+
uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v3.yml@trunk
112112
permissions:
113113
contents: read
114114
secrets: inherit

.github/workflows/props-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
# You cannot filter this event for PR comments only.
1919
# However, the logic below does short-circuit the workflow for issues.
2020
issue_comment:
21-
type:
21+
types:
2222
- created
2323
# This event will run everytime a new PR review is initially submitted.
2424
pull_request_review:

.github/workflows/pull-request-comments.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ jobs:
195195
const prBody = pr.body ?? '';
196196
const prTitle = pr.title ?? '';
197197
198-
const tracTicketRegex = new RegExp( 'https?://core.trac.wordpress.org/ticket/([0-9]+)', 'g' );
198+
const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-)([0-9]+)', 'g' );
199199
const tracTicketMatches = prBody.match( tracTicketRegex ) || prTitle.match( tracTicketRegex );
200200
201201
if ( ! tracTicketMatches ) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
3636

3737
- name: Set up Node.js
38-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
38+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
3939
with:
4040
node-version-file: '.nvmrc'
4141
cache: npm

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ on:
1111
required: false
1212
type: 'string'
1313
default: 'latest'
14+
old-branch:
15+
description: 'Whether this is an old branch that runs phpcbf instead of phpcs'
16+
required: false
17+
type: 'boolean'
18+
default: false
1419

1520
jobs:
1621
# Runs the PHP coding standards checks.
@@ -42,7 +47,7 @@ jobs:
4247
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
4348

4449
- name: Set up PHP
45-
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2.30.0
50+
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
4651
with:
4752
php-version: ${{ inputs.php-version }}
4853
coverage: none
@@ -55,7 +60,7 @@ jobs:
5560
run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
5661

5762
- name: Cache PHPCS scan cache
58-
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
63+
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
5964
with:
6065
path: |
6166
.cache/phpcs-src.json
@@ -74,6 +79,7 @@ jobs:
7479

7580
- name: Run PHPCS on all Core files
7681
id: phpcs-core
82+
if: ${{ ! inputs.old-branch }}
7783
run: phpcs -n --report-full --cache=./.cache/phpcs-src.json --report-checkstyle=./.cache/phpcs-report.xml
7884

7985
- name: Show PHPCS results in PR
@@ -82,11 +88,16 @@ jobs:
8288

8389
- name: Check test suite files for warnings
8490
id: phpcs-tests
91+
if: ${{ ! inputs.old-branch }}
8592
run: phpcs tests --report-full --cache=./.cache/phpcs-tests.json --report-checkstyle=./.cache/phpcs-tests-report.xml
8693

8794
- name: Show test suite scan results in PR
8895
if: ${{ always() && steps.phpcs-tests.outcome == 'failure' }}
8996
run: cs2pr ./.cache/phpcs-tests-report.xml
9097

98+
- name: Run PHPCBF on all Core files (old branches)
99+
if: ${{ inputs.old-branch }}
100+
run: phpcbf
101+
91102
- name: Ensure version-controlled files are not modified during the tests
92103
run: git diff --exit-code

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
6969

7070
- name: Set up Node.js
71-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
71+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
7272
with:
7373
node-version-file: '.nvmrc'
7474
cache: npm
@@ -125,7 +125,7 @@ jobs:
125125
run: npm run test:e2e
126126

127127
- name: Archive debug artifacts (screenshots, HTML snapshots)
128-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
128+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
129129
if: always()
130130
with:
131131
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
@@ -30,7 +30,7 @@ jobs:
3030
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
3131

3232
- name: Set up Node.js
33-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
33+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
3434
with:
3535
node-version-file: '.nvmrc'
3636
cache: npm

.github/workflows/reusable-performance.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
# Performs the following steps:
5555
# - Configure environment variables.
5656
# - Checkout repository.
57+
# - Determine the target SHA value (on `workflow_dispatch` only).
5758
# - Set up Node.js.
5859
# - Log debug information.
5960
# - Install npm dependencies.
@@ -109,9 +110,15 @@ jobs:
109110
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
110111
with:
111112
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
113+
fetch-depth: ${{ github.event_name == 'workflow_dispatch' && '2' || '1' }}
114+
115+
# The `workflow_dispatch` event is the only one missing the needed SHA to target.
116+
- name: Retrieve previous commit SHA (if necessary)
117+
if: ${{ github.event_name == 'workflow_dispatch' }}
118+
run: echo "TARGET_SHA=$(git rev-parse HEAD^1)" >> $GITHUB_ENV
112119

113120
- name: Set up Node.js
114-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
121+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
115122
with:
116123
node-version-file: '.nvmrc'
117124
cache: npm
@@ -274,7 +281,7 @@ jobs:
274281
run: npm run test:performance
275282

276283
- name: Archive artifacts
277-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
284+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
278285
if: always()
279286
with:
280287
name: performance-artifacts${{ inputs.memcached && '-memcached' || '' }}-${{ github.run_id }}

.github/workflows/reusable-php-compatibility.yml

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

4343
- name: Set up PHP
44-
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2.30.0
44+
uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
4545
with:
4646
php-version: ${{ inputs.php-version }}
4747
coverage: none
@@ -58,7 +58,7 @@ jobs:
5858
run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
5959

6060
- name: Cache PHP compatibility scan cache
61-
uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
61+
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
6262
with:
6363
path: .cache/phpcompat.json
6464
key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-php-${{ inputs.php-version }}-phpcompat-cache-${{ hashFiles('**/composer.json', 'phpcompat.xml.dist') }}

0 commit comments

Comments
 (0)