Skip to content

Resume and refresh release preparation safely - #14

Merged
samuel-williams-shopify merged 1 commit into
mainfrom
refresh-release-preparation
Sep 21, 2026
Merged

samuel-williams-shopify merged 1 commit into
mainfrom
refresh-release-preparation

Conversation

@samuel-williams-shopify

@samuel-williams-shopify samuel-williams-shopify commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

Preparation validates and reuses an existing local or remote release branch, so retrying after an interrupted push or PR creation does not create another version bump. Existing PRs are validated against the current default branch; stale content and conflicting release requests stop.

Adds refresh=true to the release tasks and preparation workflow. Refresh preserves the previous commit, including manual edits, under release-backups/vVERSION/OLD_SHA, regenerates from the current default branch, and updates the release branch with an explicit force-with-lease. Concurrent remote updates are rejected. The shared guide and generated agent context explain retrying and refreshing.

Validation: 90 tests / 273 assertions pass, with 378/378 measured lines covered. RuboCop and API documentation coverage pass. Tests use real Git repositories and Bake tasks for interrupted PR creation, unpublished local branches, stale notes, manual edits, concurrent pushes, and conflicting requests.

@samuel-williams-shopify
samuel-williams-shopify force-pushed the refresh-release-preparation branch 2 times, most recently from 8d5ed3e to 3045973 Compare September 21, 2026 20:48
@samuel-williams-shopify
samuel-williams-shopify merged commit f25b0a4 into main Sep 21, 2026
17 checks passed
@samuel-williams-shopify
samuel-williams-shopify deleted the refresh-release-preparation branch September 21, 2026 21:29
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