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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃尡 add support for beta/rc releases in release notes #1636

Merged

Conversation

tuminoid
Copy link
Member

@tuminoid tuminoid commented Mar 26, 2024

Support beta and RC releases in release note generator. Rename notes.go the same way, and add nice unfolding summary section to hide details in beta/rc notes.

Fix previous release tag pattern detection in Makefile.

Example output visible in CAPM3 PR: metal3-io/cluster-api-provider-metal3#1567

Basically a cherry-pick from CAPM3 PR metal3-io#1567.

Support beta and RC releases in release note generator. Move some logic
from Makefile to the release note generator, and then add nice unfolding
summary section to hide details in beta/rc notes.

Fix previous release tag pattern detection in Makefile.

Signed-off-by: Tuomo Tanskanen <tuomo.tanskanen@est.tech>
@metal3-io-bot metal3-io-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 26, 2024
@tuminoid
Copy link
Member Author

/override metal3-bmo-e2e-test-pull test-centos-e2e-integration-main

@metal3-io-bot
Copy link
Contributor

@tuminoid: Overrode contexts on behalf of tuminoid: metal3-bmo-e2e-test-pull, test-centos-e2e-integration-main

In response to this:

/override metal3-bmo-e2e-test-pull test-centos-e2e-integration-main

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Member

@kashifest kashifest left a comment

Choose a reason for hiding this comment

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

/approve

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kashifest

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 26, 2024
@tuminoid
Copy link
Member Author

Copy link
Member

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2024
@tuminoid
Copy link
Member Author

Tide wakey wakey, its been 20 mins since the flags.

@metal3-io-bot metal3-io-bot merged commit d46e201 into metal3-io:main Mar 26, 2024
23 checks passed
@metal3-io-bot metal3-io-bot deleted the tuomo/fix-release-note-generator branch March 26, 2024 12:33
@tuminoid
Copy link
Member Author

/cherry-pick release-0.5

@metal3-io-bot
Copy link
Contributor

@tuminoid: #1636 failed to apply on top of branch "release-0.5":

Applying: add support for beta/rc releases in release notes
Using index info to reconstruct a base tree...
M	.github/workflows/release.yaml
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
Auto-merging .github/workflows/release.yaml
CONFLICT (content): Merge conflict in .github/workflows/release.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add support for beta/rc releases in release notes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tuminoid
Copy link
Member Author

/cherry-pick release-0.5

Not needed for the rc/beta since we don't do those from release branches, but release note generator/makefile fixes.

@tuminoid
Copy link
Member Author

Did manual cherry-pick at #1693 .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants