Skip to content

Commit 8689044

Browse files
Split patch and minor releases
Since minors don't cherry-pick but cut master directly.
1 parent 928f6fa commit 8689044

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

bundler/doc/playbooks/RELEASING.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,22 @@ versions from their meaning. Because of this, we also may release "small"
3636
breaking changes in minor releases. "Small" here means that we expect them to
3737
affect only very few users in rare cases.
3838

39-
### Patch && minor releases
39+
### Minor releases
4040

41-
Patch and minor releases are made by cherry-picking pill requests from `master`.
41+
Minor releases of the next version start with a new release branch from the
42+
current state of master: `3.2`, and are immediately followed by a stable
43+
release.
44+
45+
### Patch releases
46+
47+
Patch releases are made by cherry-picking pull requests from `master`.
4248

4349
### Branching
4450

4551
Bundler releases are synchronized with rubygems releases at the moment. That
4652
means that releases for both share the same stable branch, and they should
4753
generally happen together.
4854

49-
Minor releases of the next version start with a new release branch from the
50-
current state of master: `3.2`, and are immediately followed by a stable
51-
release.
52-
5355
The current conventional naming for stable branches is `x+1.y`, where `x.y` is
5456
the version of `bundler` that will be released. This is because `rubygems-x+1.y`
5557
will be released at the same time.

0 commit comments

Comments
 (0)