-
Notifications
You must be signed in to change notification settings - Fork 8k
release-process: update based on 8.5.0RC1 and discussions #19939
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.
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
base: master
Are you sure you want to change the base?
release-process: update based on 8.5.0RC1 and discussions #19939
Conversation
DanielEScherzer
commented
Sep 23, 2025
- Add PHP 8.5 release schedule link
- Note that the patch-level branch for PHP X.Y.0 is created as part of the last planned release candidate
- Clarify when patch-level branches are pushed
- Add a hint about the values for API versions
* Add PHP 8.5 release schedule link * Note that the patch-level branch for PHP X.Y.0 is created as part of the last planned release candidate * Clarify when patch-level branches are pushed * Add a hint about the values for API versions
| > 💬 **Hint** \ | ||
| > The *patch-level version branch* for GA (PHP X.Y.0) is created as part of the | ||
| > last *planned* RC release (currently PHP X.Y.0RC4). After the last RC is released | ||
| > additional bug fixes in the branch will not be a part of PHP X.Y.0. If a regression |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the branch
referring to 8.5 not the 8.5.0 mentioned from above. Maybe clarify?
| Do not forget to merge up PHP-X.Y all the way to master. When resolving | ||
| the conflicts, ignore the changes from PHP-X.Y in higher branches. It | ||
| means using something like `git checkout --ours .` when on PHP.X.Y+1 or | ||
| master after the merge resulting in the conflicts. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe this could use an example and maybe a reminder to set up merge.NEWS from https://wiki.php.net/vcs/gitfaq ?
NattyNarwhal
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remember the bit about the last RC being confusing last cycle; I think this clarifies this well.