refactor(autoflow): simplify release branch/tag dance, drop force-push (#320)#373
Merged
Conversation
#320) - Remove `--force` from the tag push in `release.ts`. A tag that already exists at a different commit is now left untouched; the guarded local `git tag -f` (only when an existing tag points at a different commit, with a warning) is preserved. - Consolidate the local/manual release path: instead of bouncing dev -> main -> dev with redundant `pull --ff-only` / `pull --rebase` / duplicate `push main` + `push dev` round-trips, do a single fast-forward `main` from `dev`, publish/deploy/record evidence once, push `main`, then fast-forward `dev` from `main` and push `dev`. Fewer branch transitions, lower risk of a half-released state. - Updated the local-plan assertion in policy.test.ts to the new step name. The release flow itself is not executed by CI (it needs publish/release credentials), so this needs a human eye before the next real release. Closes #320
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
Contributor
|
APIError: Insufficient Balance |
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.
Summary
#320 (real) / batch #319 asks to simplify the AutoFlow release flow: reduce the
git branch/tag dance and avoid force-pushing tags.
Changes in
tools/autoflow/release.ts:git push --force origin <tag>becamegit push origin <tag>. A tag that already exists at a different commit isnow left untouched (the local
git tag -fis still guarded by anexisting-commit comparison + warning, so it only fires when truly needed).
devandmainwith redundantpull --ff-only/pull --rebaseandduplicate
push main+push devround-trips. The new path does a singlefast-forward
mainfromdev, publishes/deploys/records evidence once,pushes
main, then fast-forwarddevfrommainand pushesdev. Fewerbranch transitions, lower risk of a half-released state.
tools/autoflow/__tests__/policy.test.tsupdated for the renamed local-planstep.
Test plan
deno test tools/autoflow/__tests__/: 25 passed.deno fmt+deno lint+deno checkclean onrelease.ts.credentials). This change should get a human eye before the next real
release, but it reduces rather than increases release risk.
Closes #320