Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
x/build/cmd/releasebot: check that security branch is merged into release branch #34505
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.