Make WordPress Core

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.md to include the new branch.
  • Update the GitHub actions workflows that test branches to include the new branch.
  • Update the .version-support-(mysql|php).json files in trunk.

In the new branch:

  • Run npm run grunt post-branching to update GitHub Actions workflow files.
  • Pin the LOCAL_PHP and LOCAL_DB_VERSION values 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 includes all the changes required post-branching for trunk:

  • Bump the version in version.php, composer.json, package.json, and package-lock.json to 7.2-alpha.
  • Add 7.1.x to the list of versions receiving security updates in SECURITY.md.
  • Add the 7.1 branch to the test-old-branches.yml workflow matrices, and update CURRENTLY_SUPPORTED_BRANCH.
  • Add 7.1-RC2 to 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.
  • Add 7-2 keys to .version-support-mysql.json and .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.

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

#3 @joedolson
4 weeks ago

In 63167:

Build/Test Tools: Post-branching updates for trunk.

Reviewed by jorbin

Props wildworks, desrosj, joedolson, jorbin.
See #65844.

#4 @joedolson
4 weeks ago

In 63168:

Post 7.1 branching changes for the 7.1 branch.

Reviewed by jorbin

Props joedolson, jorbin.
See #65844.

@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 of replace:workflow-references-local-to-remote, and resulted in those changes being included in the commit to trunk.

This part of the commit can be reverted, but this PR can be closed out.

#10 @desrosj
4 weeks ago

  • Owner set to desrosj
  • Resolutionfixed
  • Status newclosed

In 63230:

Build/Test Tools: Change workflow file references back to local ones.

[63167] made several required post-branching changes to trunk, but also included the results of grunt replace:workflow-references-local-to-remote which is run as part of grunt post-branching.

All reusable workflow files in trunk should be called using local references so that changes to these files are automatically tested within pull requests without having to push the changes to a fork and change the references.

Props joedolson, wildworks.
Fixes #65844. See #62416.

#11 follow-up: @desrosj
4 weeks ago

  • Resolution fixed
  • Status closedreopened

Reopening for the few remaining tasks:

  • A few more release-focused tickets need to be created.
  • It looks like the default for DB_VERSION in the 7.1 branch is set to 8.4 within docker-compose.yml, but the version used in .env.example is set to 9.7. Since 9.7 is the newest supported version of MySQL in WP 7.1, the Docker file should be updated to image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-8.4}

#12 @desrosj
4 weeks ago

  • Type defect (bug)task (blessed)

#13 @JeffPaul
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 @wildworks
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_VERSION in the 7.1 branch is set to 8.4 within docker-compose.yml, but the version used in .env.example is set to 9.7. Since 9.7 is the newest supported version of MySQL in WP 7.1, the Docker file should be updated to image: ${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.

#15 @desrosj
3 weeks ago

  • Milestone 7.1

Ticket retargeted after milestone closed

#16 @desrosj
3 weeks ago

  • Milestone7.1

#17 @SergeyBiryukov
3 weeks ago

In 63327:

Build/Test Tools: Test 7.1 in upgrade testing workflows.

This sets 7.1 as the most recent branch of WordPress in the upgrade testing workflows.

See #65845, #65844.

#18 @sabernhardt
2 weeks ago

  • Resolutionfixed
  • Status reopenedclosed

#19 @sabernhardt
2 weeks ago

  • Resolution fixed
  • Status closedreopened

Sorry, was this supposed to move to 7.1.1?

Note: See TracTickets for help on using tickets.