Skip to content

ci(dependabot): merge minor and patch updates only after CI Success - #564

Merged
sunerpy merged 1 commit into
mainfrom
ci/dependabot-wait-for-ci
Oct 1, 2026
Merged

sunerpy merged 1 commit into
mainfrom
ci/dependabot-wait-for-ci

Conversation

@sunerpy

@sunerpy sunerpy commented Oct 1, 2026

Copy link
Copy Markdown
Owner

背景

#562 把 Dependabot 改成分组 PR 之后,第一个分组 PR #563(4 个 Action 的小版本更新)在 14:46:44 创建,19 秒后就被「Dependabot Auto-Merge」合进了 main,CI 到 14:52 才跑完。原因:仓库没有必需检查,gh pr merge --auto 会直接合并,不等 CI。这次 CI 事后全部通过,但以后每周的小版本与补丁分组 PR 都会这样未经 CI 进入 main。

改动

  • 自动合并前等待这个 PR head 上的 CI Success:成功才 gh pr merge --squash --match-head-commit;失败或 40 分钟内没有结果就留给人工(只打警告,不合并)。
  • Dependabot 推了新 head 时,取消还在等旧 head 的那一轮(concurrency)。
  • 补上查询检查结果需要的 checks: read,job 超时放宽到 45 分钟。
  • 大版本更新仍然只评论、不合并。

验证

🤖 Generated with Claude Code

- with no required checks, gh pr merge --auto merged #563 before CI ran
- wait for the CI Success check on the PR head, merge with --match-head-commit,
  and leave the PR for review when CI fails or does not finish in 40 minutes
- cancel the wait for a superseded head; grant checks: read for the lookup
@codecov

codecov Bot commented Oct 1, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
see 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@sunerpy
sunerpy merged commit e5f1e99 into main Oct 1, 2026
12 checks passed
@sunerpy
sunerpy deleted the ci/dependabot-wait-for-ci branch October 1, 2026 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant