feat(ci): introduce merge queue#2024
Conversation
|
As I was looking into this, one thing that I realized that is likely contributing to this issue is the fact that our branch checks run on the code as-is on the branch, whereas the default for With the |
93901ba to
ea7de15
Compare
This is interesting. I was not aware of this. Maybe we could reach out to the copy-pr-bot team to better align the behaviour. One thing to note however, is that even if we were to run against the "merge" result on the PR (which we could do on public infrastructure for steps that don't need repo write access already), this is not updated as |
Closes #1946 Signed-off-by: Evan Lezar <elezar@nvidia.com>
ea7de15 to
7210ca3
Compare
Signed-off-by: Evan Lezar <elezar@nvidia.com>
Signed-off-by: Evan Lezar <elezar@nvidia.com>
Summary
Add merge-queue support for the required OpenShell CI gates. The existing copy-pr-bot PR mirror flow remains intact, and merge-group runs publish the same stable
OpenShell / ...status contexts for the queued integration SHA.Related Issue
Closes #1946
Changes
.github/workflows/branch-checks.yml: addmerge_groupas a required branch-check trigger..github/workflows/branch-e2e.yml: addmerge_groupand make push, manual, and queue E2E selection explicit..github/workflows/helm-lint.yml: addmerge_groupvalidation for queued integration commits..github/workflows/required-ci-gates.yml: publish required CI statuses for merge-group SHAs without requiring apull-request/<N>mirror branch..github/actions/pr-gate/action.yml: document that non-push events includemerge_group.CI.mdandarchitecture/build.md: document the maintainer merge-queue workflow and required contexts.Deviations from Plan
None — implemented as planned. The branch was rebased after #2022 merged so local validation includes that main Rust test fix.
Testing
mise run markdown:lintgit diff --check origin/main...HEADmise run pre-commitpasses locally (attempted after rebasing on fix(server): update driver spec test argument #2022; Rust check/lint, Python, Helm, Markdown, license, docs, and packaging checks passed, buttest:ruststill fails on this machine becausexcrun --show-sdk-pathcannot find the macOS SDK and the CLI integration test temporaryfake-forward-processcannot link-lSystem)Tests added:
e2e/files changed.Checklist
Documentation updated:
CI.md: merge queue behavior, required contexts, maintainer workflow, and workflow file roles.architecture/build.md: CI architecture now includes merge-group validation.