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

SHIP-0038: Release Branching and Backports #190

Merged

Conversation

adambkaplan
Copy link
Member

@adambkaplan adambkaplan commented Feb 21, 2024

Changes

Provisional enhancement proposal to outline Shipwright's strategy for release branching and applying backports. The proposal's goal is to let sub-projects issue patch releases for bug fixes and security advisories. This is accomplished using a release branch name convention and updates to project release processes.

Future iterations of this proposal will identify specific changes to be made in our existing release tooling. These updates will also describe how to apply these procedures retroactively to the v0.12.0 releases of the following sub-projects:

  • build
  • operator
  • cli

Relates to #85

Submitter Checklist

  • Includes tests if functionality changed/was added
  • Includes docs if changes are user-facing
  • Set a kind label on this PR
  • Release notes block has been filled in, or marked NONE

See the contributor guide
for details on coding conventions, github and prow interactions, and the code review process.

Release Notes

NONE

Provisional enhancement proposal to outline Shipwright's strategy for
release branching and applying backports. The proposal's goal is to let
sub-projects issue patch releases for bug fixes and security
advisories. This is accomplished using a release branch name convention
and updates to project release processes.

Future iterations of this proposal will identify specific changes to be
made in our existing release tooling. These updates will also describe
how to apply these procedures retroactively to the `v0.12.0` releases
of the following sub-projects:

- build
- operator
- cli

Signed-off-by: Adam Kaplan <[email protected]>
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 21, 2024
Fix typo for "Projects"

Co-authored-by: Sascha Schwarze <[email protected]>
- Replace `v0.12.z` references with "most recent released version."
- Mark LTS and backports to older releases out of scope.
- Clarify that we should have at most two branches accepting backports
  at a given moment in time. Maintainers may backport further at their
  discretion (ex: a Critical CVE).

Signed-off-by: Adam Kaplan <[email protected]>
@qu1queee
Copy link
Contributor

neat, I like the proposed process.

Fix typos from review

Co-authored-by: Enrique Encalada <[email protected]>
Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 left a comment

Choose a reason for hiding this comment

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

/approve

Copy link

openshift-ci bot commented Feb 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SaschaSchwarze0

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 23, 2024
@qu1queee
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 25, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 1d276ab into shipwright-io:main Feb 25, 2024
1 check passed
@adambkaplan adambkaplan mentioned this pull request Mar 5, 2024
4 tasks
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants