ROX-36649: remove empty commit from patch release - #3816
Conversation
| local head_commit_msg | ||
| head_commit_msg=$(git log -1 --format='%s' "$branch_ref") | ||
|
|
||
| if [[ "$head_commit_msg" =~ ^Release\ [0-9]+\.[0-9]+\.[0-9]+$ ]]; then | ||
| log_warn "Tip of $release_branch is already a release commit: $head_commit_msg" | ||
| if ! confirm "Create another release commit on top?"; then | ||
| log_info "Aborted by user." | ||
| exit 0 | ||
| fi | ||
| echo | ||
| fi | ||
|
|
| # Note: this intentionally does NOT create a new commit. Tagging HEAD directly | ||
| # avoids pushing a commit to the protected release branch, so no "bypass branch | ||
| # protection" permission is required (see ROX-36649). |
There was a problem hiding this comment.
You documenting planning and historical steps, not augmenting the code to facilitate readability.
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Central YAML (base), Organization UI (inherited) Review profile: CHILL Plan: Advanced Run ID: 📒 Files selected for processing (1)
Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review. 📝 SummarySummary by CodeRabbit
WalkthroughThe patch release script now tags the current release branch HEAD directly. It no longer creates an empty release commit or pushes the release branch. The branch protection prerequisite and duplicate release-commit check were removed. ChangesPatch release flow
Priority: ⬇️ Low Estimated code review effort: 2 (Simple) | ~10 minutes Change: Bug fix Suggested reviewers: Sequence Diagram(s)sequenceDiagram
participant PatchReleaseScript
participant LocalGitRepository
participant RemoteGitRepository
PatchReleaseScript->>LocalGitRepository: Resolve release branch reference
PatchReleaseScript->>LocalGitRepository: Create annotated tag at current HEAD
PatchReleaseScript->>RemoteGitRepository: Push release tag only
Merge Risk: ⚪ Minimal · up to The tag-only release flow has no confirmed merge-blocking issue. 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches 💡 1📝 Generate docstrings 💡
🧪 Generate unit tests (beta)
Comment |
|
@alkmim: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
Remove the empty commit from patch release script. See https://redhat.atlassian.net/browse/ROX-36649 for context