Skip to content

Commit b54d2f6

Browse files
committed
Merge branch 'trunk' into workflow-linting
# Conflicts: # .github/workflows/phpunit-tests.yml # .github/workflows/reusable-cleanup-pull-requests.yml
2 parents 64b09bf + e9058ee commit b54d2f6

917 files changed

Lines changed: 50173 additions & 51525 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.

.env.example

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,8 @@ LOCAL_WP_TESTS_DOMAIN=example.org
6767

6868
# The URL to use when running e2e tests.
6969
WP_BASE_URL=http://localhost:${LOCAL_PORT}
70+
71+
##
72+
# This silences the tips output by the dotenv package.
73+
##
74+
DOTENV_CONFIG_QUIET=true

.git-blame-ignore-revs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,14 @@ d44e1c2ce2dc638e89ed6a1d02b1cfadb8a15fe7 # [60048]
6161
a18719e7ea49ab7ac0091e076840cb7efdf51cc5 # [60049]
6262

6363
# 6.9 Coding Standards
64+
d0d89b62485e724e3d06f01981dd1940b2f36fce # [60074]
65+
c53010159b60735ffa6ba5fa8a416ff0e86a159c # [60109]
6466
cbb6519119276ceba4279eaee73ab66294ebd820 # [60402]
67+
3d736c763e0b1384c65abfa3bcf6d3bc45869516 # [60664]
68+
b96f25f5c31bfd1580c21084c368098792b4c741 # [60780]
69+
ff6c5fadfa6272685d910b474917ecb6adc17f10 # [60808]
70+
08b2f9cfe9064873a501c3543e2c995405431dcc # [60816]
71+
e683403cc1856113e3cb010b1579dcd01cdef5fc # [61036]
72+
8d24041c08a58b2f79504699fb3f63d01737b876 # [61075]
73+
87cbbb1dfcf19fcfc128fc66603462a649d01502 # [61087]
74+
db1b4811e5ab8df343b03032d7607abe01a9e8e2 # [61138]

.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: 7 additions & 6 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
@@ -98,7 +99,7 @@ jobs:
9899
99100
steps:
100101
- name: Dispatch workflow run
101-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
102+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
102103
with:
103104
retries: 2
104105
retry-exempt-status-codes: 418

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
contents: write
4444
steps:
4545
- name: Download artifact
46-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
46+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
4747
with:
4848
script: |
4949
const artifacts = await github.rest.actions.listWorkflowRunArtifacts( {
@@ -161,7 +161,7 @@ jobs:
161161
if: ${{ steps.artifact-check.outputs.exists == 'true' }}
162162
working-directory: 'pr-repo'
163163
run: |
164-
git commit -m "Automation: Updating built files with changes. [dependabot skip]"
164+
git commit -m "Automation: Updating built files with changes."
165165
166166
- name: Push changes
167167
if: ${{ steps.artifact-check.outputs.exists == 'true' }}

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

Lines changed: 6 additions & 6 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:
@@ -103,7 +103,7 @@ jobs:
103103
)
104104
steps:
105105
- name: Dispatch workflow run
106-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
106+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
107107
with:
108108
retries: 2
109109
retry-exempt-status-codes: 418

.github/workflows/failed-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Rerun a workflow
33-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
33+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
3434
with:
3535
retries: 15
3636
retry-exempt-status-codes: 418

.github/workflows/install-testing.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Confirms that installing WordPress using WP-CLI works successfully.
22
#
33
# This workflow is not meant to test wordpress-develop checkouts, but rather tagged versions officially available on WordPress.org.
4+
#
5+
# This workflow is triggered for all WordPress versions that are currently receiving security updates. It therefore needs to
6+
# retain support for older PHP and database versions.
47
name: Installation Tests
58

69
on:
@@ -94,11 +97,12 @@ jobs:
9497
- db-version: '9.1'
9598
- db-version: '9.2'
9699
- db-version: '9.3'
100+
- db-version: '9.4'
97101
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
98102
- php: '7.2'
99-
db-version: '9.4'
103+
db-version: '9.5'
100104
- php: '7.3'
101-
db-version: '9.4'
105+
db-version: '9.5'
102106

103107
services:
104108
database:
@@ -117,7 +121,7 @@ jobs:
117121
118122
steps:
119123
- name: Set up PHP ${{ matrix.php }}
120-
uses: shivammathur/setup-php@20529878ed81ef8e78ddf08b480401e6101a850f # v2.35.3
124+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
121125
with:
122126
php-version: '${{ matrix.php }}'
123127
coverage: none
@@ -170,7 +174,7 @@ jobs:
170174
171175
steps:
172176
- name: Dispatch workflow run
173-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
177+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
174178
with:
175179
retries: 2
176180
retry-exempt-status-codes: 418

0 commit comments

Comments
 (0)