Repository navigation
meta: Merge release/cli/0.48.0 and bump to 0.49.0-dev.0 - #2028
Merged
Merged
Conversation
…0.48.0 Co-Authored-By: BYK <126780+BYK@users.noreply.github.com> # Conflicts: # packages/cli/plugins/sentry-cli/skills/sentry-cli/references/init.md
#skip-changelog Co-Authored-By: BYK <126780+BYK@users.noreply.github.com>
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
This was referenced Nov 5, 2026
BYK
added a commit
to getsentry/craft
that referenced
this pull request
Nov 5, 2026
) Follow-up to #964. When Craft can't merge the release branch back, it now fails the publish instead of logging a warning. That way the failure shows up in getsentry/publish and can be retried or recovered from there. The toolkit `cli/0.48.0` publish ([job log](https://github.com/getsentry/publish/actions/runs/42102069927/job/127507152523)) is the motivating case. Every target shipped, but the merge hit a conflict. Craft warned and reported success, so the run was green while the release branch stayed unmerged and `postReleaseBump` was skipped. Someone had to read the logs to notice. getsentry/toolkit#2028 cleans up that release. **What changed** - When `handleReleaseBranch` fails with a merge conflict, a push failure, or any other error, `craft publish` now throws `ReleaseBranchMergeError`. The error says every target published and lists the conflicting files and the diff. It also says how to recover: - merge the target branch into the release branch and push it, so the retry merges the new head, or - merge the release branch into the target branch yourself with a merge commit (not a squash), so the retry is a no-op merge plus cleanup. - The publish state file is kept, so the retry skips the published targets and only merges. In getsentry/publish, the issue checkboxes already do the same, so re-adding `accepted` retries only the merge. - The post-release bump and the post-release command are skipped. They run on the successful retry. - `BranchCleanupError` stays a warning, because the merge was already pushed and a retry can't help. - Sentry reporting now goes through the global error handler, instead of a `captureException` call in the merge path. This reverses the earlier decision that the merge is non-blocking housekeeping. I updated `.lore.md` and the release-workflow docs to match. **Verification** - New `publishMain` tests: a merge conflict and a push failure both reject with `ReleaseBranchMergeError` and keep the state file, and a failed merge skips the bump. The existing cleanup-failure test still passes as a warning. - `pnpm lint` and `tsc` pass, and the `src/commands` and resolver tests pass (91 tests). In the full `pnpm test`, the only failures are the same e2e failures (24 in `prepare-dry-run.e2e` and one other file) that I also see on `master` in my sandbox. **Not changed:** the getsentry/publish failure comment still says "Bad branch? You can delete with ease and start over". For a merge failure that's the wrong advice: deleting the branch makes the retry fail with "Could not find the release branch". <!-- junior-request-attribution:start --> via @BYK. <!-- junior-request-attribution:end --> <!-- junior-session-footer:start --> <!-- junior-conversation-id:local%3Aweb%3A2b52a6f3270e30b7c2e844d3 --> -- [View Session in Sentry](https://sentry.sentry.io/explore/conversations/local%3Aweb%3A2b52a6f3270e30b7c2e844d3/?project=4510944073809921) <!-- junior-session-footer:end --> Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com> Co-authored-by: BYK <126780+BYK@users.noreply.github.com>
This was referenced Nov 7, 2026
This branch was previously deployed
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.
This finishes the CLI 0.48.0 release. Every publish target shipped, but Craft couldn't merge the release branch back into
main(job log), so the post-release bump never ran either.Why the merge failed:
release: 0.48.0(283b555) changedversion: 0.48.0-dev.0toversion: 0.48.0inreferences/init.md. #1856 changed thedescription:line right below it onmain. The fix in Craft is getsentry/craft#964.This PR
release/cli/0.48.0intomain. That brings in the 0.48.0CHANGELOG.mdsection and the release versions. Forinit.md, it keeps the new description frommaintogether withversion: 0.48.0. I resolved the conflict with the resolver from fix(publish): Resolve merge conflicts caused only by the version bump craft#964.postReleaseBumpdoes: the npm bump plusversioning.filesfrom.craft.yml.packages/cli/package.jsonandpackages/mcp-server/package.json→0.49.0-dev.0SKILL.md,references/*.md) →0.49.0-dev.0.claude-plugin/plugin.json→0.49.0(stripPrerelease)Squash merging is fine: the
cli@0.48.0tag already points at the release commit. Once this lands,release/cli/0.48.0can be deleted.#skip-changelog
via @BYK.
--
View Session in Sentry