Skip to content

Post-branching changes for the 6.9 branch #10512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Post-branching changes for the 6.9 branch #10512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dc3230
Post-branching changes for the 6.9 branch
desrosj Nov 13, 2025
4f8e464
Apply the rest of the patch from Trac ticket
desrosj Nov 13, 2025
b0dd94b
PHP 8.5 will be supported by WP 6.9.
desrosj Nov 13, 2025
fa8ffa2
Pin the newest LTS version of MySQL
desrosj Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ LOCAL_PORT=8889
LOCAL_DIR=src

# The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
LOCAL_PHP=latest
LOCAL_PHP=8.5-fpm

# Whether or not to enable Xdebug.
LOCAL_PHP_XDEBUG=false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-built-files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ jobs:
check-for-built-file-changes:
name: Check built files
if: ${{ github.repository == 'wordpress/wordpress-develop' }}
uses: ./.github/workflows/reusable-check-built-files.yml
uses: WordPress/wordpress-develop/.github/workflows/reusable-check-built-files.yml@trunk
permissions:
contents: read
2 changes: 1 addition & 1 deletion .github/workflows/cleanup-pull-requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
permissions:
pull-requests: write
if: ${{ github.repository == 'WordPress/wordpress-develop' }}
uses: ./.github/workflows/reusable-cleanup-pull-requests.yml
uses: WordPress/wordpress-develop/.github/workflows/reusable-cleanup-pull-requests.yml@trunk
6 changes: 3 additions & 3 deletions .github/workflows/coding-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@ jobs:
# Runs the PHP coding standards checks.
phpcs:
name: Coding standards
uses: ./.github/workflows/reusable-coding-standards-php.yml
uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-php.yml@trunk
permissions:
contents: read
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}

# Runs the JavaScript coding standards checks.
jshint:
name: Coding standards
uses: ./.github/workflows/reusable-coding-standards-javascript.yml
uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-javascript.yml@trunk
permissions:
contents: read
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}

slack-notifications:
name: Slack Notifications
uses: ./.github/workflows/slack-notifications.yml
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
permissions:
actions: read
contents: read
Expand Down
168 changes: 0 additions & 168 deletions .github/workflows/commit-built-file-changes.yml
View file
Open in desktop
Copy link
Contributor

@peterwilsoncc peterwilsoncc Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm unclear why this file is being dropped, shouldn't these be run on PRs for all branches?

Copy link
Member Author

@desrosj desrosj Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mistakenly thought that workflow_run events would use the version of the workflow file in the primary branch, but that seems to not be the case.

The documentation also does not explicitly clarify this. It does say "This event will only trigger a workflow run if the workflow file exists on the default branch." But that doesn't mean the actual workflow file in the default branch will be used, just that it has to be there to run at all.

This is not great because it means we lose the benefits of the reusable pattern by including a workflow with business logic in old branches.

I'm thinking that the added maintenance burden of including this workflow in older branches likely outweighs the benefits. Especially given that:

  • almost every change committed to non-default branches should be first committed to trunk and opening a PR with trunk as a base branch will run the workflow
  • After the next version of WordPress is released, pull requests are almost never opened against older branches.
  • The Test Build Process workflow already runs nearly every build task that creates built files before checking for any uncommitted changes to files under version control. This will at least flag things that were missed without automatically fixing, committing, and pushing the updates back.

If we decide to remove this in older branches, then the check-built-files.yml workflow should also be deleted because there's no point running it if this one will not be triggered on workflow_run with the completed type.

@johnbillion do you happen to have any thoughts?

Copy link
Member

@johnbillion johnbillion Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My preference would also be to remove this workflow in order to reduce the maintenance burden, but we'd need to acknowledge that it reintroduces the possibility of committing a change to a branch that is missing its corresponding built file change. Basically the same as what we had in trunk prior to the introduction of this workflow.

Copy link
Member Author

@desrosj desrosj Nov 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've gone and created Core-64296 to keep track of this and explore possible solutions.

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/end-to-end-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
# Runs the end-to-end test suite.
e2e-tests:
name: ${{ matrix.label }}
uses: ./.github/workflows/reusable-end-to-end-tests.yml
uses: WordPress/wordpress-develop/.github/workflows/reusable-end-to-end-tests.yml@trunk
permissions:
contents: read
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
Expand All @@ -72,7 +72,7 @@ jobs:

slack-notifications:
name: Slack Notifications
uses: ./.github/workflows/slack-notifications.yml
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
permissions:
actions: read
contents: read
Expand Down
56 changes: 0 additions & 56 deletions .github/workflows/failed-workflow.yml
View file
Open in desktop

This file was deleted.

Loading
Loading