Skip to content

Proposal for maintenance release strategy alignment - #53

Open
peanball wants to merge 2 commits into
ironcore-dev:mainfrom
sap-contributions:release-branching
Open

Proposal for maintenance release strategy alignment#53
peanball wants to merge 2 commits into
ironcore-dev:mainfrom
sap-contributions:release-branching

Conversation

@peanball

@peanball peanball commented Jul 27, 2026

Copy link
Copy Markdown
Member

Unify the approach, how maintenance releases are managed in git and GitHub.

Easier viewing of the whole document: https://github.com/sap-contributions/ironcore-enhancements/blob/release-branching/ieps/tbd-release-branching.md

@peanball
peanball force-pushed the release-branching branch 2 times, most recently from 39cdc62 to 5764e0a Compare July 27, 2026 12:34
@peanball
peanball marked this pull request as ready for review July 27, 2026 12:36
@peanball
peanball requested a review from a team as a code owner July 27, 2026 12:36
@peanball
peanball requested a review from maxmoehl July 27, 2026 12:38

@friegger friegger left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM, I support the proposed solution.

@mkalcok mkalcok left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The main proposal makes the most sense to me for the current pre-v1 development. The alternatives seem more suitable for "after-v1" development, where major releases are further apart and better defined in terms of features/compatibility.

I'm not even sure that this drawback of the main proposal applies:

Determining the 'branching off point' for the maintenance branch is not as clear-cut and may require manual intervention or complex logic.

If you need to backport a fix, and the maintenance branch doesn't exist yet, you can just use the tag to determine where to branch from, right?

@peanball

peanball commented Aug 3, 2026

Copy link
Copy Markdown
Member Author

@mkalcok

I'm not even sure that this drawback of the main proposal applies:

Determining the 'branching off point' for the maintenance branch is not as clear-cut and may require manual intervention or complex logic.

If you need to backport a fix, and the maintenance branch doesn't exist yet, you can just use the tag to determine where to branch from, right?

Yes, as human the logic is pretty clear. What I was alluding to was if we were to automate something to back port a particular PR, the release branch may need to be created on the fly, based on the latest available tag (semver) to branch off of. "Manual intervention" is then the part of seeing it easily as a human and making a branch at the appropriate tag. Complex logic is to do correct semver and semver parsing. I will add a note that this drawback is about automation.

@mkalcok

mkalcok commented Aug 3, 2026

Copy link
Copy Markdown

@mkalcok

I'm not even sure that this drawback of the main proposal applies:

Determining the 'branching off point' for the maintenance branch is not as clear-cut and may require manual intervention or complex logic.

If you need to backport a fix, and the maintenance branch doesn't exist yet, you can just use the tag to determine where to branch from, right?

Yes, as human the logic is pretty clear. What I was alluding to was if we were to automate something to back port a particular PR, the release branch may need to be created on the fly, based on the latest available tag (semver) to branch off of. "Manual intervention" is then the part of seeing it easily as a human and making a branch at the appropriate tag. Complex logic is to do correct semver and semver parsing. I will add a note that this drawback is about automation.

Ah, makes sense, thanks for the clarification. I was assuming human intervention for these backports.

Unify the approach, how maintenance releases are managed in git and GitHub.

Signed-off-by: Alexander Lais <alexander.lais@sap.com>
Mention focus on pre-1.0 development process.

Clarify that the "finding the right place for a maintenance branch point"
is related to automation. As human it's clear, which tag is the last
relevant one to start a maintenance branch for a particular version.

Signed-off-by: Alexander Lais <alexander.lais@sap.com>
@peanball
peanball force-pushed the release-branching branch from 5764e0a to e916d36 Compare August 3, 2026 07:43
@peanball

peanball commented Aug 3, 2026

Copy link
Copy Markdown
Member Author

@mkalcok

Ah, makes sense, thanks for the clarification. I was assuming human intervention for these backports.

Clarified with e916d36 in the proposal as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants