Repository navigation
fix(release): land the fold and the version raise through pull requests - #168
Merged
Merged
Conversation
main takes changes only through a pull request (GH013), so bin/release's direct 'git push origin main' was refused and then misreported as 'main moved on origin while folding the changelog — run bin/release again'. - The Unreleased fold now runs the in-repo 'cli-dev changelog fold --land', which folds on a fresh origin/main, opens a PR, checks for conflicts, refolds once and merges — the path app scripts use since 0.36.0. - Raising the version when npm already has it lands through a land() helper (branch, PR, wait for checks, squash-merge, fast-forward main), as max-cli's bin/release does. A refused push or merge now says what happened and that nothing was published. Co-Authored-By: Claude Opus 5.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
1 participant
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.
Task
bin/release pushed the changelog fold and the version raise straight to
main. Branch protection refuses that (GH013), and the script then said "main moved on origin while folding the changelog — run bin/release again", which is wrong.What
cli-dev changelog fold --land(fold on fresh origin/main, PR, conflict check, refold once, merge) — the same path app scripts use through@wirecat/cli-base@0.36.0.land()helper: branch, PR, wait for checks, squash-merge, fast-forwardmain— as in max-cli's bin/release. Refused push or merge now says so and that nothing was published.No CHANGELOG entry:
bin/releaseis not in the published package.Testing
sh -n bin/release;pnpm typecheck && pnpm lint && pnpm test(713 passed);pnpm docs:check.changelog fold --version 0.38.0on current main: no change, exit 0.land()run against a local bare remote with a stubgh: branch pushed, merged into main, local main fast-forwarded to origin/main.🤖 Generated with Claude Code