Skip to content

Commit f4f149c

Browse files
committed
Merge branch 'trunk' into ppiwo/trunk
2 parents 4a8e4bf + 241357d commit f4f149c

File tree

349 files changed

+33091
-10368
lines changed

Some content is hidden

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

349 files changed

+33091
-10368
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ jobs:
5454
uses: ./.github/workflows/reusable-coding-standards-php.yml
5555
permissions:
5656
contents: read
57-
if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
57+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
5858

5959
# Runs the JavaScript coding standards checks.
6060
jshint:
6161
name: Coding standards
6262
uses: ./.github/workflows/reusable-coding-standards-javascript.yml
6363
permissions:
6464
contents: read
65-
if: ${{ github.repository == 'WordPress/wordpress-develop' || ( github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' ) }}
65+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
6666

6767
slack-notifications:
6868
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
uses: ./.github/workflows/reusable-javascript-tests.yml
5656
permissions:
5757
contents: read
58-
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' }}
5959

6060
slack-notifications:
6161
name: Slack Notifications

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ jobs:
109109
db-version: '9.4'
110110
- php: '7.3'
111111
db-version: '9.4'
112+
# No PHP 8.5 + Memcached support yet.
113+
- php: '8.5'
114+
memcached: true
112115

113116
with:
114117
os: ${{ matrix.os }}

.github/workflows/performance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
determine-matrix:
5454
name: Determine Matrix
5555
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' ) }}
56+
if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ! contains( github.event.before, '00000000' ) }}
5757
permissions:
5858
actions: read
5959
env:

.github/workflows/php-compatibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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)