[CNSL-1934] Add pre-release pending deploy branch management#105
Open
linhcrl wants to merge 1 commit intocockroachdb:mainfrom
Open
[CNSL-1934] Add pre-release pending deploy branch management#105linhcrl wants to merge 1 commit intocockroachdb:mainfrom
linhcrl wants to merge 1 commit intocockroachdb:mainfrom
Conversation
linhcrl
changed the title
linhcrl
force-pushed
the
pre-release-branch-management
branch
from
f81608f to
427284b
Compare
linhcrl
force-pushed
the
pre-release-branch-management
branch
5 times, most recently
from
f9a2f35 to
cb4189b
Compare
linhcrl
force-pushed
the
pre-release-branch-management
branch
from
cb4189b to
3f5a6bc
Compare
fantapop
reviewed
May 1, 2026
Contributor
fantapop
left a comment
fantapop
left a comment
There was a problem hiding this comment.
I left some feedback. In general, this feels like a lot of logic to be inlining into these workflows and going untested. Did you consider the approach we took in the actions repo to separate out some of the logic to actual code files?
| GH_TOKEN: ${{ secrets.MANAGED_SERVICE_TOKEN }} | ||
| run: | | ||
| # Get all release tags matching release-YYYY-MM-DD-N pattern | ||
| all_tags=$(gh api repos/cockroachlabs/managed-service/tags --paginate --jq '.[].name' | grep -E '^release-[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9]+$') |
Contributor
There was a problem hiding this comment.
what does --paginate do here? Does that restrict us to the first page?
Comment on lines
+75
to
+77
| > not_deployed.txt | ||
| > missing_trailer.txt | ||
| > unexpected_status.txt |
Contributor
There was a problem hiding this comment.
This is kind of a weird syntax... I guess if it works. Normally I would use touch
| while IFS='|' read -r sha subject; do | ||
| echo "Checking commit $sha: $subject" | ||
|
|
||
| # Extract Managed-service-commit-SHA trailer from commit message |
Contributor
There was a problem hiding this comment.
I'm not really clear whats going on here. Is trailer the right terminology to be used?
Comment on lines
+31
to
+35
| - name: Fetch latest remote refs | ||
| run: | | ||
| # Ensure we have the latest branches and tags from origin | ||
| git fetch origin --tags --force | ||
| git fetch origin --prune |
Contributor
There was a problem hiding this comment.
I was surprised this step would be necessary in either workflow. Can you document why that is in a comment?
| git fetch origin --tags --force | ||
| git fetch origin --prune | ||
|
|
||
| - name: Find latest pending deploy branch |
Contributor
There was a problem hiding this comment.
It looks like a lot of the stuff from this workflow are copied from the other workflow. Maybe it would make sense to bundle this stuff into an action instead.
linhcrl
force-pushed
the
pre-release-branch-management
branch
18 times, most recently
from
78434b0 to
e52ef90
Compare
Introduces two workflows to manage the release process:
1. pending-deploy-pr.yml (workflow_dispatch trigger):
- Finds the latest pending-deploy-YYYYMMDD-hhmmss branch
- Creates a PR to merge it into main
2. pending-deploy-check.yml (pull_request trigger):
- Validates pending deploy PRs before merge
- Checks that Managed-service-commit-SHA trailers reference deployed
commits
- Blocks merge until all changes are confirmed deployed in
managed-service
- Posts PR comments detailing any undeployed commits
This ensures SDK releases only reference deployed CC API changes.
Co-Authored-By: roachdev-claude <[email protected]>
linhcrl
force-pushed
the
pre-release-branch-management
branch
from
e52ef90 to
1b798ac
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
2 participants
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.
Introduces two workflows to manage the release process:
pending-deploy-pr.yml (repository_dispatch trigger):
pending-deploy-check.yml (pull_request trigger):
This ensures SDK releases only include changes that are live in production.
Relevant screenshots
PR opened by pending-deploy-pr.yml
Comment left by pending-deploy-check.yml on failed check