fix(release): merge concurrent main updates - #858
Merged
Conversation
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.
Problem
Release preparation completed versioning, clean build, and the full serial test gate, then failed at
git push origin mainbecause PR #853 merged while the release was running. The release branch was non-fast-forward even though every release artifact was already verified.Failed run: https://github.com/code-yeongyu/senpi/actions/runs/31680010156
Fix
origin/mainafter the release tag and next-cycle commit are created.Verification
npm run check: passed.v2026.8.13tag or npm version exists.Summary by cubic
Synchronizes and merges concurrent
origin/mainupdates during release before pushing to prevent non-fast-forward failures. Previously we pushed without syncing; now we fetchorigin/mainafter creating the release tag and next-cycle commit and merge if needed, keeping the tag on the verified commit.scripts/release-git.mjsand callssyncRemoteMainBeforePushinscripts/release.mjsafter the next-cycle commit and before both pushes.origin/mainis not an ancestor, creates a two-parent merge onmain; release artifacts and tag remain unchanged.Written for commit 54bcd71. Summary will update on new commits.