Skip to content

Commit ba4e379

Browse files
committed
[ci skip] update branch creation time frame in release process doc
1 parent 33dae4b commit ba4e379

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

docs/release-process.md

+16-10
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ slightly different steps. We'll call attention where the steps differ.
121121
3. Check out the *release branch* for this release from the *version branch*.
122122

123123
> 🔶 **Non-stable version branches: pre-GA** \
124-
> There is no *version branch* for alpha releases. Instead, treat the main
125-
> branch as the version branch. You will create a local-only release branch
126-
> from the main branch. Do not push it!
124+
> There is no *version branch* for alpha or beta releases. Instead, treat the
125+
> main branch as the version branch. You will create a local-only release
126+
> branch from the main branch. Do not push it!
127127
>
128128
> ```shell
129129
> git checkout -b php-X.Y.0alpha1-local-release-branch upstream/master
130130
> ```
131131
>
132-
> During the first beta release, you will create (and push!) the version
132+
> During the first RC release, you will create (and push!) the version
133133
> branch for the pre-GA release, e.g., `PHP-8.2`. See
134134
> "[Forking a new version branch](#forking-a-new-version-branch)" below.
135135
> From this point forward, all pre-GA release branches will be created from
@@ -845,16 +845,15 @@ recommendation and the intervals may vary based on work load.
845845
846846
## Forking a new version branch
847847
848-
When the new version has reached the feature freeze point during its pre-release
849-
cycle, it is time to create a new version branch. This frees up the main branch
850-
(i.e., `master`) for any new feature development that cannot go into the new
851-
version.
848+
When the new version has reached the first RC, it is time to create a new
849+
version branch. This frees up the main branch (i.e., `master`) for any new
850+
feature development that cannot go into the new version.
852851
853-
1. One week prior to tagging `X.Y.0beta1`, warn internals@ that your version's
852+
1. One week prior to tagging `X.Y.0RC1`, warn internals@ that your version's
854853
branch is about to be created. Be specific about when the branch creation
855854
will occur. For example: https://news-web.php.net/php.internals/99864
856855
857-
2. Just prior to tagging `X.Y.0beta1`, create the new version branch locally,
856+
2. Just prior to tagging `X.Y.0RC1`, create the new version branch locally,
858857
i.e. `PHP-X.Y`.
859858
860859
3. Add a commit on the main branch (i.e., `master`) after the branch point.
@@ -885,6 +884,13 @@ version.
885884
* [Add PHP-8.1 to the Git steps page][]
886885
* [Changes to the wiki][]
887886
887+
> 💬 **Hint** \
888+
> We create the new version branch at the first release candidate rather than at
889+
> feature freeze to allow a period of time where the focus is on making the new
890+
> version ready for RC and GA. During this time, the main branch is *only* for
891+
> minor improvements and bug fixes. All major improvements and new features must
892+
> wait.
893+
888894
889895
## Preparing for the initial stable version (PHP X.Y.0)
890896

0 commit comments

Comments
 (0)