You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
| Active Development| Regular development phase where new features and fixes are added. |
28
32
| Stabilization | Phase focused on stabilizing the release by fixing bugs. |
29
-
| Ask Mode |Changes are scrutinized and only critical fixes are allowed. No new features are accepted. This is the last phase before a release is closed. |
30
-
| Servicing | Only essential fixes are made to support the release. a.k.a. maintenance mode|
31
-
| Out of service | A previous release, which is no longer receiving updates. |
33
+
| Ask Mode |Only critical fixes are allowed; changes are scrutinized. No new features. This is the last phase before a release is closed. |
34
+
| Servicing | Only essential fixes are made to support the release (a.k.a. maintenance mode).|
35
+
| Out of service | A previous release which is no longer receiving updates. |
32
36
33
37
### Release branch process
34
38
35
39
We track the state of candidates for a given release by tagging the PRs with the following labels:
36
40
37
-
*`backport_YYMM`: This PR (to `main`) is a candidate to be included in the
38
-
`YYMM` release.
39
-
* N.B.: A maintainer will _remove_ this tag if the fix is not accepted into
40
-
the release.
41
-
*`backported_YYMM`: This PR (to `main`) has been cherry-picked to the `YYMM`
42
-
release.
41
+
*`backport_<RELEASE>`: This PR (to `main`) is a candidate to be included in the release.
42
+
* N.B.: A maintainer will _remove_ this tag if the fix is not accepted into the release.
43
+
*`backported_<RELEASE>`: This PR (to `main`) has been cherry-picked to the release branch.
43
44
44
45
#### Seeking Approval for Backport
45
46
46
47
To seek approval to include a change in a release branch, follow these steps:
47
48
48
-
* Tag your PR to `main` PR with the `backport_YYMM` label.
49
-
* Cherry-pick the change to the appropriate `release/YYMM` branch in your fork
50
-
and stage a PR to that same branch in the main repository.
49
+
1. Tag your PR to `main` with the `backport_<RELEASE>` label.
50
+
2. Wait for the PR to be merged to `main`.
51
+
3. Cherry-pick the change to the appropriate release branch in your fork and
52
+
stage a PR to that same branch in the main repository.
51
53
52
54
Please reach out to the maintainers before staging that PR if you have any
53
55
doubts.
54
56
55
57
#### Backport PR Best Practices
56
58
57
-
When creating a backport PR to a `release/YYMM` branch:
59
+
When creating a backport PR to a release branch:
58
60
59
61
***Clean cherry-picks are strongly preferred.** A clean cherry-pick minimizes
60
62
reviewer effort and reduces the risk of introducing regressions.
@@ -69,8 +71,14 @@ When creating a backport PR to a `release/YYMM` branch:
0 commit comments