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
docs: tell how to create a release branch for patch releases (#2329)
This adds some doc for how to create a branch when a patch release needs
to be based on the
original release and not from head.
---------
Co-authored-by: Ignas Anikevicius <[email protected]>
If a patch release from head would contain changes that aren't appropriate for
50
+
a patch release, then the patch release needs to be based on the original
51
+
release tag and the patch changes cherry-picked into it.
52
+
53
+
In this example, release `0.37.0` is being patched to create release `0.37.1`.
54
+
The fix being included is commit `deadbeef`.
55
+
56
+
1.`git checkout -b release/0.37 0.37.0`
57
+
1.`git push upstream release/0.37`
58
+
1.`git cherry-pick -x deadbeef`
59
+
1. Fix merge conflicts, if any. If `MODULE.bazel.lock` conflicts occur, then
60
+
run `pre-commit run update-bzlmod-lockfiles -a`
61
+
1.`git cherry-pick --continue` (if applicable)
62
+
1.`git push upstream`
63
+
64
+
If multiple commits need to be applied, repeat the `git cherry-pick` step for
65
+
each.
66
+
67
+
Once the release branch is in the desired state, use `git tag` to tag it, as
68
+
done with a release from head. Release automation will do the rest.
69
+
45
70
#### After release creation in Github
46
71
47
-
1. Ping @philwo to get the new release added to mirror.bazel.build. See [this comment on issue #400](https://github.com/bazelbuild/rules_python/issues/400#issuecomment-779159530) for more context.
48
72
1. Announce the release in the #python channel in the Bazel slack (bazelbuild.slack.com).
0 commit comments