[CNSL-2134] Add post-release pending deploy branch management #104
Open
linhcrl wants to merge 1 commit intocockroachdb:mainfrom
Open
[CNSL-2134] Add post-release pending deploy branch management #104linhcrl wants to merge 1 commit intocockroachdb:mainfrom
linhcrl wants to merge 1 commit intocockroachdb:mainfrom
Conversation
linhcrl
force-pushed
the
post-release-branch-management
branch
from
8bbde80 to
eefdec9
Compare
linhcrl
changed the title
After a successful release (tag creation), the workflow now automatically manages pending deploy branches: - Finds the most recent merged PR with a pending-deploy-YYYYMMDD-hhmmss head branch to identify what the last pending deploy branch was - Compares its timestamp with any current live pending deploy branch - Creates a new pending deploy branch if a newer one was already merged to main (indicating the current live branch is stale), or if none exists - Retargets all open PRs from old pending deploy branches to the current one. (As of now, workflow does not resolve conflicts caused by this.) This ensures that after each release, there's always a fresh pending deploy branch based on the latest main, and PRs are automatically pointed to the right target. Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
linhcrl
force-pushed
the
post-release-branch-management
branch
from
eefdec9 to
aabd8e8
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After a successful release (tag creation), the workflow now automatically manages pending deploy branches:
This ensures that after each release, there's always a fresh pending deploy branch ready, and PRs are automatically pointed to the right target.