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

x/build/cmd/releasebot: check that security branch is merged into release branch #34505

Open
bradfitz opened this issue Sep 24, 2019 · 2 comments
Assignees
Milestone

Comments

@bradfitz
Copy link
Member

@bradfitz bradfitz commented Sep 24, 2019

We recently changed how we handle point release branch management for bug fixes & security releases. We used to have one linear history in release branches and we had to land things in the correct order (security things only before a security release, and then land all bug fixes for non-security releases)

We've changed to land bug fixes on release branches immediately, and instead cutting security releases from the last release on its own branch.

There's the very real possibility now that humans'll be human and forget a step here and not merge the security branch into the release branch, resulting in a future bug fix release that removes the security fixes.

We should add a check for this in cmd/releasebot so we don't do this by accident.

/cc @andybons @dmitshur

@gopherbot gopherbot added this to the Unreleased milestone Sep 24, 2019
@gopherbot gopherbot added the Builders label Sep 24, 2019
@bradfitz bradfitz added the NeedsFix label Sep 24, 2019
@dmitshur

This comment has been minimized.

Copy link
Member

@dmitshur dmitshur commented Oct 31, 2019

/cc @cagedmantis Here's an issue related to releasebot for you to consider.

@cagedmantis cagedmantis self-assigned this Oct 31, 2019
@gopherbot

This comment has been minimized.

Copy link

@gopherbot gopherbot commented Nov 11, 2019

Change https://golang.org/cl/206437 mentions this issue: cmd/releasebot: check that the security branch is rebased into the release branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.