From f906fad985f0f87c7b9b9e94b05cbc3a11246f68 Mon Sep 17 00:00:00 2001 From: DanielEScherzer Date: Wed, 2 Jul 2025 02:48:05 -0700 Subject: [PATCH] release-process: update based on 8.5.0alpha1 (#19004) * Clarify that placeholders with `RCn` are not just for release candidates * Only PHP `X.Y.0` has pre-GA releases, no need to use `X.Y.Z` * Before `PHP-X.Y` has been created, `master` needs to be pushed for NEWS --- docs/release-process.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/release-process.md b/docs/release-process.md index 422ab1be16189..299465229551e 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -96,6 +96,13 @@ releases. `user.signingKey` values to use with your local PHP repositories. See [Conditional Includes For Git Config][] for more information. +11. Any time you see a placeholder like `php-X.Y.ZRCn`, the `RCn` is not always + a release candidate number. The placeholder could also represent any of: + * php-8.4.0alpha1 (initial alpha version) + * php-8.4.0beta2 (one of the beta versions) + * php-8.4.0 (initial GA) + * php-8.4.9 (periodic bugfix or security release) + ## Packaging a non-stable release (alpha/beta/RC) @@ -250,7 +257,7 @@ slightly different steps. We'll call attention where the steps differ. ```shell git add -p - git commit --gpg-sign=YOURKEYID -m "[ci skip] Update NEWS for PHP X.Y.Z alpha2" + git commit --gpg-sign=YOURKEYID -m "[ci skip] Update NEWS for PHP X.Y.0 alpha2" ``` The NEWS is updated at the *start* of the cycle for the next tag, e.g. @@ -289,7 +296,8 @@ slightly different steps. We'll call attention where the steps differ. ```shell git push upstream php-X.Y.ZRCn # tag name git push upstream PHP-X.Y.Z # patch-level version branch (post-GA only) - git push upstream PHP-X.Y # version branch + git push upstream PHP-X.Y # version branch (post-branch creation only) + git push upstream master # version branch (pre-branch creation only) ``` > 🚨 **Attention** \