Repository navigation
ci(dependabot): 显式入队 merge queue,修 dependabot PR 永不自动合入 - #202
Merged
Merged
Conversation
`main` 的 ruleset 启用了 merge queue(SQUASH),`gh pr merge --auto` 在这种分支上只写 autoMergeRequest、不会把 PR 放进队列。实测 #195 自 11-16 起带着 auto-merge、检查全绿却 一直停在 OPEN,#199 同样卡在 CLEAN,两个都是人工 `enqueuePullRequest` 才合上的。 - 第 1 步保留 `gh pr merge --auto --squash` 作为意图标记(`|| true`:重试场景下若已有 其它 merge method 的 autoMergeRequest,gh 会报错,但不应中断); - 第 2 步用 GraphQL `enqueuePullRequest` 显式入队,失败只出 `::warning::` 并把原因写进 job summary(已在队列中 / 必需检查未通过 / 有冲突都是无害情形)。 patch/minor 才入队,major 仍走人工评审,门禁语义不变;入队后由 merge queue 自己构建 merge group 跑全量 CI,通过才落库。
wangzhizhou
added a commit
that referenced
this pull request
Nov 22, 2026
Unreleased 补两条此前漏记的变更: - dependabot PR 显式入队 merge queue(#202),并补建缺失的 `rust` 标签; - macOS 公证 / Windows Authenticode 签名已抽成可复用 composite action。
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.
问题
main的 ruleset 启用了 merge queue(SQUASH),而Dependabot auto-merge工作流只调gh pr merge --auto --squash。在这种分支上,--auto只写下autoMergeRequest,不会把 PR 放进队列 —— 表现为:检查全绿、mergeStateStatus=CLEAN,但 PR 永远停在OPEN。2026-11-22 实测:
MERGE),15:06 检查全绿enqueuePullRequest后 15:38 合入CLEAN也就是说这条自动化在启用 merge queue 之后完全失效了,dependabot PR 只能靠人手动入队 —— 这也是 11-16 ~ 11-22 期间 4 个依赖 PR 堆积的原因之一。
改动
gh pr merge --auto --squash,作为“意图标记”(并兼容将来若关闭队列);加|| true,因为重试/复用分支场景下若已存在其它 merge method 的autoMergeRequest,gh会报错,而这不该中断后续入队。Enqueue into the merge queue:GraphQLenqueuePullRequest显式入队;失败只出::warning::(已在队列中 / 必需检查未通过 / 有冲突都属无害情形),并把gh api的原始错误写进 job summary,便于定位。入队后由 merge queue 自己构建 merge group 跑全量 CI,通过才落库 —— 等价于 auto-merge 的效果,且不会因为「等待自动入队」而空转。
验证
bash scripts/test-actions-pinning.sh通过(action 仍固定 40 位 SHA);enqueuePullRequestmutation 已用真实 PR 校验:成功时返回mergeQueueEntry{position,state},失败时gh退出码为 1 且错误可读(本 PR 里正是靠这一点区分成功/告警两条分支)。