Skip to content

Comments

Fix creating minor release if new major release branch already exist#282

Merged
Ocramius merged 1 commit intolaminas:1.26.xfrom
DanielBadura:fix-creating-new-minor-branch-if-new-major-exist
Feb 17, 2026
Merged

Fix creating minor release if new major release branch already exist#282
Ocramius merged 1 commit intolaminas:1.26.xfrom
DanielBadura:fix-creating-new-minor-branch-if-new-major-exist

Conversation

@DanielBadura
Copy link
Contributor

Q A
Documentation yes
Bugfix yes
BC Break no
New Feature no
RFC no
QA no

This patch fixes the minor branch creation if already a new major branch exist. This is useful if a new major release is already in the work but new feature are still coming into the current latest major.

The case is as follows:
When we already have these branches: 1.0.x, 1.1.x, 1.2.x, 2.0.x And we release 1.2.0, then we expect that 1.3.x is created and set as a new default branch.

…nch exist. This is useful if a new major release is already in the work but new feature are still coming into the current latest major.

The case is as follows:
When we already have these branches: 1.0.x, 1.1.x, 1.2.x, 2.0.x
And we release 1.2.0, then we expect that 1.3.x is created and set as a new default branch.

Signed-off-by: Daniel Badura <daniel.badura@patchlevel.de>
@DanielBadura DanielBadura force-pushed the fix-creating-new-minor-branch-if-new-major-exist branch from d9cc049 to f3687c5 Compare February 11, 2026 14:51
@gsteel gsteel requested a review from a team February 11, 2026 15:00
@gsteel gsteel added the Bug Something isn't working label Feb 11, 2026
@gsteel gsteel added this to the 1.26.0 milestone Feb 11, 2026
Copy link
Member

@gsteel gsteel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM, but I'm not overly familiar with this codebase so I'll defer to perhaps @Ocramius for review :)

@Xerkus
Copy link
Member

Xerkus commented Feb 11, 2026

For our purposes new minor branch needs to be created only if 2.0.x exist but 2.1.x does not. In other words there were no 2.0.0 release yet.

@DanielBadura
Copy link
Contributor Author

So is this a rule you want to enforce here? This also aligns with our purpose so I'm fine with that.
As of SemVer I think it should be fine releasing 1.23.0 even if 2.3.0 is already out but i guess up-merges would be tricky.. 😅

Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's give this a shot, thanks @DanielBadura!

@Ocramius Ocramius self-assigned this Feb 17, 2026
@Ocramius Ocramius merged commit 00473e2 into laminas:1.26.x Feb 17, 2026
9 checks passed
@DanielBadura DanielBadura deleted the fix-creating-new-minor-branch-if-new-major-exist branch February 17, 2026 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants