Opened 4 weeks ago
Last modified 2 weeks ago
#65844 reopened task (blessed)
Branching tasks for 7.1
| Reported by: | wildworks | Owned by: | desrosj |
|---|---|---|---|
| Priority: | normal | Milestone: | 7.1 |
| Component: | General | Version: | |
| Severity: | normal | Keywords: | has-patch |
| Cc: | Focuses: |
Description
This ticket is for tracking the tasks required after branching as documented in the handbook.
On w.org:
- Update
WP_CORE_DEV_BRANCH.
In trunk:
- Update
SECURITY.mdto include the new branch. - Update the GitHub actions workflows that test branches to include the new branch.
- Update the
.version-support-(mysql|php).jsonfiles intrunk.
In the new branch:
- Run
npm run grunt post-branchingto update GitHub Actions workflow files. - Pin the
LOCAL_PHPandLOCAL_DB_VERSIONvalues to the highest supported versions.
On Trac:
- Create new tickets for the next release.
Previously:
Change History (19)
This ticket was mentioned in PR #12959 on WordPress/wordpress-develop by @wildworks.
4 weeks ago
#1
- Keywords has-patch added
This ticket was mentioned in PR #12962 on WordPress/wordpress-develop by @joedolson.
4 weeks ago
#2
Trac ticket: https://core.trac.wordpress.org/ticket/65844
## Use of AI Tools
@wildworks commented on PR #12959:
4 weeks ago
#5
This PR has been committed in r63167
@wildworks commented on PR #12962:
4 weeks ago
#6
Hi, I just wanted to check if this PR is ready to be committed.
@desrosj commented on PR #12962:
4 weeks ago
#7
It looks like there are no changes in this PR currently. Based on the commit history, it seems that 65ab0183371d61d9f02a6173ef48e023f77360f1 (r63167) was meant to resolve this. However, the changes made to the workflow files in in that commit do not appear to be the ones that were originally staged in this PR (see a8db49c1a97439928270b37a8d0bb34b5c0ccc56), and are incorrect.
Remote references (@trunk) should only be used for numbered branches. The workflow file changes in r63167 will need to be reverted as the local reference is preferred (this allows changes to these files within PRs to be tested without needing to make unnecessary changes to the files).
@joedolson commented on PR #12962:
4 weeks ago
#8
This is not the PR that was used for the post-branching changes; that was from https://github.com/WordPress/wordpress-develop/pull/12959
@desrosj commented on PR #12962:
4 weeks ago
#9
After discussing this further in Slack:
- This is no longer needed. It was in fact superseded by #12959.
- The changes I noted above were not actually included in either PR.
- The process followed locally was "move to the branch, run the command, switch back to trunk, finish the rest of the process, then switch back to the branch.". So this likely reverted the file removals performed by
grunt post-branching, but left the results ofreplace:workflow-references-local-to-remote, and resulted in those changes being included in the commit totrunk.
This part of the commit can be reverted, but this PR can be closed out.
#11
follow-up:
↓ 14
@
4 weeks ago
- Resolution fixed
- Status closed → reopened
Reopening for the few remaining tasks:
- A few more release-focused tickets need to be created.
- It looks like the default for
DB_VERSIONin the7.1branch is set to8.4withindocker-compose.yml, but the version used in.env.exampleis set to9.7. Since9.7is the newest supported version of MySQL in WP 7.1, the Docker file should be updated toimage: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-8.4}
#13
@
4 weeks ago
Might be helpful to be more precise with the commit message in the future, as I was searching for something like:
Post 7.1 branching version bump.
Trunk is now 7.2-alpha.
and the commit message for the branch here was a build/test tools commit which made it hard to find in changeset/trac search.
#14
in reply to: ↑ 11
@
3 weeks ago
Replying to desrosj:
Reopening for the few remaining tasks:
- A few more release-focused tickets need to be created.
- It looks like the default for
DB_VERSIONin the7.1branch is set to8.4withindocker-compose.yml, but the version used in.env.exampleis set to9.7. Since9.7is the newest supported version of MySQL in WP 7.1, the Docker file should be updated toimage: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-8.4}
The 7.1 dry run will start in about 16 hours. As this PR concerns the development environment, it should not be a blocker for the dry run.
![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png)
This includes all the changes required post-branching for
trunk:version.php,composer.json,package.json, andpackage-lock.jsonto7.2-alpha.7.1.xto the list of versions receiving security updates inSECURITY.md.7.1branch to thetest-old-branches.ymlworkflow matrices, and updateCURRENTLY_SUPPORTED_BRANCH.7.1-RC2to the upgrade testing workflow matrices. Since these workflows test tagged versions available through WP-CLI, the pre-release version needs to be used until 7.1 is released.7-2keys to.version-support-mysql.jsonand.version-support-php.json.Note: the SVN revision in
version.php(7.2-alpha-63162-src) is a placeholder and will need to match the actual revision at commit time.## Use of AI Tools
AI assistance: Yes
Tool(s): Claude Code
Model(s): Claude Opus 5
Used for: Applying the mechanical post-branching version/matrix updates following the handbook and the previous 7.0 branching PR (#11376); reviewed and verified by me.