Skip to content

Commit 8d2a046

Browse files
committed
Merge branch 'trunk' into onchange-escape
2 parents 643fdda + e0eb90b commit 8d2a046

File tree

652 files changed

+44370
-17336
lines changed

Some content is hidden

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

652 files changed

+44370
-17336
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 191 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ permissions: {}
4545
jobs:
4646
check-for-built-file-changes:
4747
name: Check built files
48-
# This prevents an unnecessary second run after changes are committed back because Dependabot always rebases and force pushes.
49-
if: ${{ github.repository == 'wordpress/wordpress-develop' && ( github.actor != 'dependabot[bot]' || github.event.commits < 2 ) }}
48+
if: ${{ github.repository == 'wordpress/wordpress-develop' }}
5049
uses: ./.github/workflows/reusable-check-built-files.yml
5150
permissions:
5251
contents: read

.github/workflows/coding-standards.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ on:
99
- '3.[89]'
1010
- '[4-9].[0-9]'
1111
tags:
12-
- '[0-9]+.[0-9]'
13-
- '[0-9]+.[0-9].[0-9]+'
14-
- '!3.7.[0-9]+'
12+
- '3.[89]'
13+
- '3.[89].[0-9]+'
14+
- '[4-9].[0-9]'
15+
- '[4-9].[0-9].[0-9]+'
1516
pull_request:
1617
branches:
1718
- trunk
@@ -54,15 +55,15 @@ jobs:
5455
uses: ./.github/workflows/reusable-coding-standards-php.yml
5556
permissions:
5657
contents: read
57-
if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
58+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
5859

5960
# Runs the JavaScript coding standards checks.
6061
jshint:
6162
name: Coding standards
6263
uses: ./.github/workflows/reusable-coding-standards-javascript.yml
6364
permissions:
6465
contents: read
65-
if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
66+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
6667

6768
slack-notifications:
6869
name: Slack Notifications

.github/workflows/commit-built-file-changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
if: ${{ steps.artifact-check.outputs.exists == 'true' }}
161161
working-directory: 'pr-repo'
162162
run: |
163-
git commit -m "Automation: Updating built files with changes. [dependabot skip]"
163+
git commit -m "Automation: Updating built files with changes."
164164
165165
- name: Push changes
166166
if: ${{ steps.artifact-check.outputs.exists == 'true' }}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ on:
88
- '5.[3-9]'
99
- '[6-9].[0-9]'
1010
tags:
11-
- '[0-9]+.[0-9]'
12-
- '[0-9]+.[0-9].[0-9]+'
13-
- '![34].[0-9].[0-9]+'
14-
- '!5.[0-2].[0-9]+'
11+
- '5.[3-9]'
12+
- '5.[3-9].[0-9]+'
13+
- '[6-9]+.[0-9]'
14+
- '[6-9]+.[0-9].[0-9]+'
1515
pull_request:
1616
branches:
1717
- trunk
@@ -60,7 +60,7 @@ jobs:
6060
uses: ./.github/workflows/reusable-end-to-end-tests.yml
6161
permissions:
6262
contents: read
63-
if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
63+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
6464
strategy:
6565
fail-fast: false
6666
matrix:

.github/workflows/javascript-tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ on:
88
- '3.[89]'
99
- '[4-9].[0-9]'
1010
tags:
11-
- '[0-9]+.[0-9]'
12-
- '[0-9]+.[0-9].[0-9]+'
13-
- '!3.7.[0-9]+'
11+
- '3.[89]'
12+
- '3.[89].[0-9]+'
13+
- '[4-9].[0-9]'
14+
- '[4-9].[0-9].[0-9]+'
1415
pull_request:
1516
branches:
1617
- trunk
@@ -55,7 +56,7 @@ jobs:
5556
uses: ./.github/workflows/reusable-javascript-tests.yml
5657
permissions:
5758
contents: read
58-
if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
59+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
5960

6061
slack-notifications:
6162
name: Slack Notifications

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Local Docker Environment
22

33
on:
4+
# Local Docker environment testing was introduced in WordPress 6.8.
45
push:
56
branches:
67
- trunk
@@ -92,7 +93,7 @@ jobs:
9293
fail-fast: false
9394
matrix:
9495
os: [ ubuntu-24.04 ]
95-
memcached: [ false ]
96+
memcached: [ false, true ]
9697
php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }}
9798
db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }}
9899

@@ -109,6 +110,9 @@ jobs:
109110
db-version: '9.4'
110111
- php: '7.3'
111112
db-version: '9.4'
113+
# No PHP 8.5 + Memcached support yet.
114+
- php: '8.5'
115+
memcached: true
112116

113117
with:
114118
os: ${{ matrix.os }}

.github/workflows/performance.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
name: Performance Tests
22

33
on:
4+
# Performance testing was introduced in WordPress 6.2.
45
push:
56
branches:
67
- trunk
78
- '6.[2-9]'
89
- '[7-9].[0-9]'
910
tags:
10-
- '[0-9]+.[0-9]'
11-
- '[0-9]+.[0-9].[0-9]+'
12-
- '![45].[0-9].[0-9]+'
13-
- '!6.[01].[0-9]+'
11+
- '6.[2-9]'
12+
- '6.[2-9].[0-9]+'
13+
- '[7-9].[0-9]'
14+
- '[7-9].[0-9].[0-9]+'
1415
pull_request:
1516
branches:
1617
- trunk
@@ -53,7 +54,7 @@ jobs:
5354
determine-matrix:
5455
name: Determine Matrix
5556
runs-on: ubuntu-24.04
56-
if: ${{ ( github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) ) && ! contains( github.event.before, '00000000' ) }}
57+
if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ! contains( github.event.before, '00000000' ) }}
5758
permissions:
5859
actions: read
5960
env:
@@ -101,7 +102,7 @@ jobs:
101102
strategy:
102103
fail-fast: false
103104
matrix:
104-
memcached: [ false ]
105+
memcached: [ false, true ]
105106
multisite: [ true, false ]
106107
subject: ${{ fromJson( needs.determine-matrix.outputs.subjects ) }}
107108
with:
@@ -119,7 +120,7 @@ jobs:
119120
strategy:
120121
fail-fast: false
121122
matrix:
122-
memcached: [ false ]
123+
memcached: [ false, true ]
123124
multisite: [ true, false ]
124125
# A matrix value is needed in the 'name' directive for proper grouping in the GitHub UI.
125126
label: [ Compare ]

.github/workflows/php-compatibility.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ on:
88
- '5.[5-9]'
99
- '[6-9].[0-9]'
1010
tags:
11-
- '[0-9]+.[0-9]'
12-
- '[0-9]+.[0-9].[0-9]+'
13-
- '![34].[0-9].[0-9]+'
14-
- '!5.[0-4].[0-9]+'
11+
- '5.[5-9]'
12+
- '5.[5-9].[0-9]+'
13+
- '[6-9].[0-9]'
14+
- '[6-9].[0-9].[0-9]+'
1515
pull_request:
1616
branches:
1717
- trunk
@@ -47,7 +47,7 @@ jobs:
4747
uses: ./.github/workflows/reusable-php-compatibility.yml
4848
permissions:
4949
contents: read
50-
if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
50+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
5151

5252
slack-notifications:
5353
name: Slack Notifications

0 commit comments

Comments
 (0)