Skip to content

fix(ci): don't let the uncommitted npm bump abort the plugin version sync - #340

Merged
JonasJesus42 merged 1 commit into
mainfrom
ci-fix-sync-dirty-tree
Sep 2, 2026
Merged

fix(ci): don't let the uncommitted npm bump abort the plugin version sync#340
JonasJesus42 merged 1 commit into
mainfrom
ci-fix-sync-dirty-tree

Conversation

@JonasJesus42

@JonasJesus42 JonasJesus42 commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

#339 shipped broken. The Sync plugin version step committed, then died on:

error: cannot pull with rebase: You have unstaged changes.

Set version deliberately leaves an uncommitted bump to packages/parity/package.json in the tree — npm already has that version and the file is never committed. A dirty tree makes git pull --rebase abort, so the push never ran.

Fallout on v0.33.9: npm and the GitHub release are fine, but plugin.json stayed at 0.33.0 and the Discord step was skipped (it runs after the failed step).

Fix

  • git checkout -- packages/parity/package.json before the git work — that bump is throwaway by design.
  • -c rebase.autoStash=true on 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:

  • without the fix → the exact cannot pull with rebase error
  • with the fix → rebases onto the other commit, pushes, plugin.json lands at the new version, and the human commit survives

Merging publishes 0.33.10 and syncs plugin.json to it in the same run.


Summary by cubic

Fixes the plugin version sync so git pull --rebase no longer aborts on the uncommitted packages/parity/package.json bump, which broke v0.33.9: plugin.json stayed at 0.33.0 and the Discord step was skipped. Merging publishes 0.33.10 and syncs plugin.json to it in the same run.

  • Discards the throwaway package.json bump before the git work.
  • Enables rebase.autoStash so stray build artifacts can't abort the rebase the same way.

Written for commit 2869481. Summary will update on new commits.

Review in cubic

…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>
@JonasJesus42
JonasJesus42 merged commit 0982d61 into main Sep 2, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant