fix(ci): preserve merge commits when syncing main into dev - #484
Merged
Conversation
Auto-merge was unconditionally --squash, which dropped origin/main as an ancestor and made the next dev → main PR conflict on AGENTS.md. Use --merge when the title starts with "Merge main into". Also dispatch Deploy Dev after a GITHUB_TOKEN merge, because those pushes do not trigger on.push, and promotion to main requires an active dev deploy. Remove the transient PR deployment recorder; it was masking the stack mis-wiring rather than replacing cluster deploy. Co-authored-by: ZUENS2020 <ZUENS2020@users.noreply.github.com>
PR Summary
Changed Files (top 200)
|
This was referenced Aug 22, 2026
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.
变更摘要
修复
dev上 auto-merge 无条件 squash 导致的拓扑问题，并在 GITHUB_TOKEN 合并后补触发 Deploy Dev。auto-merge-dev.yml：标题以Merge main into/Merge origin/main开头的 PR 使用--merge，其余仍--squashdev后workflow_dispatchDeploy Dev（GITHUB_TOKEN push 不会触发on: push，而dev→main需要一次成功的dev环境部署）record-dev-deployment.yml：那是给错误 stack 的权宜之计，会把真实集群部署标成 inactive#483 已被 squash 合入，
origin/main仍不是dev的祖先。本 PR 落地后会再开一条 Merge main into dev PR，用 merge commit 补回拓扑。风险与回滚点
sherpa-devnamespace（现有行为）。若 self-hosted runner 不在线，dispatch 会排队或失败，提升 PR 仍可能显示 Missing successful active dev deployment。--squashonly。验证结果
python3 -c 'import yaml; yaml.safe_load(...)'通过