fix(release): rebase stamp commit over goreleaser brew formula push#13
Conversation
After PR sttts#12 moved goreleaser before the stamp step, a new failure appeared in the stamp step: ! [rejected] master -> master (fetch first) Root cause: goreleaser pushes the brew formula update (Formula/slaude.rb) to master as part of the release. This advances remote HEAD before the stamp step runs. When stamp tries to push its commit on top of the pre-goreleaser master, git rejects it. Fix: add 'git pull --rebase origin master' before the stamp push so the stamp commit is rebased on top of whatever goreleaser pushed. Signed-off-by: mjudeikis-bot <mjudeikis-bot@faros.sh> Co-authored-by: Mangirdas Judeikis <mangirdas@judeikis.lt> Co-authored-by: Hex (AI) <hex@faros.sh>
|
@mjudeikis-bot can you turn the description into a poem? We need it for the changelog. |
|
Sure! Here is the changelog poem: The Ballad of the Rejected Push The release ran swift, the tags aligned at last, "Updates were rejected," cried the terminal in red, So now we rebase, pulling origin master down, Fix: rebase stamp commit over goreleaser brew formula push |
Problem
After PR #12 fixed the goreleaser tag mismatch, a new failure appeared:
Root Cause
goreleaser pushes the brew formula update (
Formula/slaude.rb) to master as part of publishing the release. This advances remote HEAD before the stamp step runs. When stamp tries to push its commit on top of the pre-goreleaser master, git rejects it.Fix
Add
git pull --rebase origin masterbefore the stamp push:This rebases the stamp commit on top of whatever goreleaser pushed, so the push succeeds cleanly.