Skip to content

fix: make /ship reruns resume safely - #684

Closed
AliFozooni wants to merge 2 commits into
garrytan:mainfrom
AliFozooni:fix/ship-rerun-safety
Closed

AliFozooni wants to merge 2 commits into
garrytan:mainfrom
AliFozooni:fix/ship-rerun-safety

Conversation

@AliFozooni

Copy link
Copy Markdown
Contributor

Summary

  • add a rerun-safety checkpoint before the /ship version bump so a failed PR-creation step resumes instead of double-bumping VERSION
  • teach the push and PR/MR steps to detect already-pushed branches and existing PRs/MRs before recreating them
  • add regression coverage for the generated ship skill text so the resume-safe behavior stays locked in

Problem

A partial failure between push and PR creation can currently leave /ship in a state where rerunning the workflow bumps VERSION again and duplicates the top CHANGELOG entry.

Testing

  • git diff --check
  • node verification of the new resume-safety strings in ship/SKILL.md, ship/SKILL.md.tmpl, and test/gen-skill-docs.test.ts

Fixes #649

@time-attack

Copy link
Copy Markdown
Contributor

@16francej Please close this PR. Safe resume behavior for repeated ship runs already shipped in #693 and was hardened further on main. This older branch relies on fragile commit-message guesses and should not be merged.

@capy-ai

capy-ai Bot commented Sep 24, 2026

Copy link
Copy Markdown

Closing as superseded by #693 and the current shipping workflow, most recently clarified in merged #2970. Current main classifies ALREADY_BUMPED version state, checks whether the branch is already pushed, and updates an existing PR/MR rather than creating a duplicate; the changelog workflow replaces overlapping branch entries with one unified entry. Verification still runs on every invocation. The associated issue #649 is being closed as completed; this older alternate implementation is no longer needed.

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.

fix: /ship Steps 7-8 not idempotent — re-run after partial failure corrupts VERSION and CHANGELOG

2 participants