Clean up stale release branch before Create Release PR retry#4035
Merged
Clean up stale release branch before Create Release PR retry#4035
Conversation
JAORMX
approved these changes
Mar 6, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4035 +/- ##
==========================================
- Coverage 68.62% 68.56% -0.06%
==========================================
Files 444 444
Lines 45222 45222
==========================================
- Hits 31034 31008 -26
- Misses 11791 11817 +26
Partials 2397 2397 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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
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.
Summary
When the Create Release PR workflow fails after creating the
release/vX.Y.Zbranch but before opening the PR (e.g. helm-docs or file update failure), the branch remains. A retry fails with "Reference already exists" because releaseo cannot create the same branch again.This change adds a pre-step that:
Type of change
Test plan
task test)task test-e2e)task lint-fix)Manually verified the cleanup logic: branch name derivation matches releaseo (release/v{major}.{minor}.{patch}), and gh pr list/gh api usage is valid.
Changes
.github/workflows/create-release-pr.yml.claude/skills/toolhive-release/references/WORKFLOW-REFERENCE.mdDoes this introduce a user-facing change?
No. Improves workflow robustness for release automation only.
Special notes for reviewers
The cleanup step uses
secrets.GITHUB_TOKEN(via GH_TOKEN) for gh CLI, separate fromsecrets.RELEASE_TOKENused by releaseo.contents: writeis sufficient for deleting refs.