fix(ci): don't let the uncommitted npm bump abort the plugin version sync - #340
Merged
Conversation
…sync Set version leaves packages/parity/package.json dirty by design, which made git pull --rebase abort with "cannot pull with rebase" -- so v0.33.9 committed the plugin bump but never pushed it, and skipped the Discord notification. Restore that file before the git work, and autoStash the rebase so a stray build artifact can't abort it the same way. Verified in a scratch repo with a competing merge landing mid-publish: fails identically without the fix, rebases and pushes cleanly with it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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.
#339 shipped broken. The
Sync plugin versionstep committed, then died on:Set versiondeliberately leaves an uncommitted bump topackages/parity/package.jsonin the tree — npm already has that version and the file is never committed. A dirty tree makesgit pull --rebaseabort, so the push never ran.Fallout on v0.33.9: npm and the GitHub release are fine, but
plugin.jsonstayed at0.33.0and the Discord step was skipped (it runs after the failed step).Fix
git checkout -- packages/parity/package.jsonbefore the git work — that bump is throwaway by design.-c rebase.autoStash=trueon the pull, so a stray build artifact can't abort the rebase the same way.Verified
Reproduced in a scratch repo, including a competing human merge landing during the publish:
cannot pull with rebaseerrorplugin.jsonlands at the new version, and the human commit survivesMerging publishes
0.33.10and syncsplugin.jsonto it in the same run.Summary by cubic
Fixes the plugin version sync so
git pull --rebaseno longer aborts on the uncommittedpackages/parity/package.jsonbump, which broke v0.33.9:plugin.jsonstayed at0.33.0and the Discord step was skipped. Merging publishes0.33.10and syncsplugin.jsonto it in the same run.package.jsonbump before the git work.rebase.autoStashso stray build artifacts can't abort the rebase the same way.Written for commit 2869481. Summary will update on new commits.