Repository navigation
fix: Don't fail promote.yml when the RC version was never bumped - #347
Merged
Merged
Conversation
The "Force-push baked train onto stable" step unconditionally created a commit for the version reset done in the previous step. When the RC branch's Cargo.toml version was never bumped away from the last published version (e.g. because release-rc.yml didn't run when the branch was cut), the reset is a no-op and `git commit -am` fails with "nothing to commit", aborting the whole promotion. Skip the commit in that case and just force-push the candidate's existing commits onto stable as-is; the version reset only needs its own commit when it actually changes something. Co-authored-by: Copilot App <[email protected]>
scouten-adobe
changed the title
scouten-adobe
added a commit
that referenced
this pull request
Sep 22, 2026
The "Force-push baked train onto stable" step unconditionally created a commit for the version reset done in the previous step. When the RC branch's Cargo.toml version was never bumped away from the last published version (e.g. because release-rc.yml didn't run when the branch was cut), the reset is a no-op and `git commit -am` fails with "nothing to commit", aborting the whole promotion. Skip the commit in that case and just force-push the candidate's existing commits onto stable as-is; the version reset only needs its own commit when it actually changes something. Co-authored-by: Copilot App <[email protected]>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #347 +/- ##
=======================================
Coverage 72.32% 72.32%
=======================================
Files 4 4
Lines 1066 1066
=======================================
Hits 771 771
Misses 295 295 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This was referenced Sep 22, 2026
Merged
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.
What
The
Force-push baked train onto stablestep inpromote.ymlunconditionally rangit commit -am ...after the version-reset step, assuming the reset always produces a diff.Why
When a release-candidate branch's
Cargo.tomlversion was never bumped away from the last published version (e.g.release-rc.ymldidn't run when the branch was cut — as happened with0.28.0-rc, whose version stayed at0.27.20), the reset step is a no-op, sogit commit -amfails with "nothing to commit, working tree clean" and aborts the whole promotion.This caused https://github.com/contentauth/c2patool/actions/runs/35767798022/job/106881644896 to fail.
Fix
Only create the reset commit when the reset actually changed something; otherwise just force-push the candidate's existing commits onto
stableas-is.This needs to be backported to the
0.28.0-rcbranch afterward so the pending promotion can proceed.Co-authored-by: Copilot App [email protected]