fix: prevent release push race condition#151
Merged
Merged
Conversation
Deploying archgate-cli with
|
| Latest commit: |
8e7a837
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://71a8ed96.archgate-cli.pages.dev |
| Branch Preview URL: | https://fix-release-race-condition.archgate-cli.pages.dev |
Add git pull --rebase before the release step so that any PRs merged between workflow start and release push are included. Without this, the push fails as non-fast-forward when main moves forward during the release workflow. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
rhuanbarreto
force-pushed
the
fix/release-race-condition
branch
from
7fa3ab5 to
8e7a837
Compare
Merged
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
git pull --rebase origin mainbefore the release step in the release workflowProblem
The release workflow checks out
mainat the start, then runs validate + release. If a PR is merged between checkout and the finalgit push main(done internally bysimple-release-action), the push is rejected as non-fast-forward. This happened during the v0.22.0 release when GEN-003 (#149) was merged during the release window.Fix
A
git pull --rebaseright before the release step ensures the local checkout includes any commits that landed onmainsince the workflow started. The release action's push is then guaranteed to be fast-forward.Test plan
🤖 Generated with Claude Code