Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: release branches as releases/vX.Y instead of releases/vX.Y.Z #1071

Conversation

jakobmoellerdev
Copy link
Contributor

@jakobmoellerdev jakobmoellerdev commented Nov 11, 2024

What this PR does / why we need it

This reworks the release branch action to correctly branch off in patterns that do not include Z / Patch versions:

releases/v0.17.0 # before
releases/v0.17 # after

To achieve this it allows to print only the major/minor combination for the release_generate.go generator.

Additionally, it adds an automatic bump to main after the Branch Cutoff was completed into main.

Which issue(s) this PR fixes

Currently our release branches include the 0 Z / Patch version as part of their name, but this is misleading because we also use these branches for patches onto the Y / Minor version.

This fixes up the release branch creation to

  1. Create the Branch according to this pattern
  2. Fixup the Main Branch with a Version Bump PR after the bump so that the next minor development can start.

part of #995 to ensure proper candidate creation

This reworks the release branch action to correctly branch off in patterns that do not include Z / Patch versions:

```
releases/v0.17.0 # before
releases/v0.17 # after
```

To achieve this it allows to print only the major/minor combination for the release_generate.go generator.

Additionally, it adds an automatic bump to main after the Branch Cutoff was completed into main.
@jakobmoellerdev jakobmoellerdev requested a review from a team as a code owner November 11, 2024 11:37
@github-actions github-actions bot added the chore label Nov 11, 2024
@jakobmoellerdev
Copy link
Contributor Author

Example for a Run of this PR in the internal member-only testing Repository:

https://github.com/open-component-model/ocm-cicd-playground/actions/runs/11721978049

(The run also included the automatic creation of a first release candidate but this is left out of this PR)

@jakobmoellerdev jakobmoellerdev added the component/github-actions Changes on GitHub Actions or within `.github/` directory label Nov 11, 2024
@hilmarf hilmarf added this to the 2024-Q4 milestone Nov 11, 2024
@hilmarf hilmarf enabled auto-merge (squash) November 11, 2024 14:09
@hilmarf hilmarf merged commit 378bcc0 into open-component-model:main Nov 11, 2024
17 checks passed
@hilmarf hilmarf added the kind/chore chore, maintenance, etc. label Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/github-actions Changes on GitHub Actions or within `.github/` directory kind/chore chore, maintenance, etc.
Projects
Status: 🔒Closed
Development

Successfully merging this pull request may close these issues.

2 participants