Skip to content

Enable reliable auto-merge for main-to-amd-staging sync PRs#3235

Open
vkallesh wants to merge 1 commit into
amd-stagingfrom
amd/infra/vkallesh/ensure-automerge
Open

Enable reliable auto-merge for main-to-amd-staging sync PRs#3235
vkallesh wants to merge 1 commit into
amd-stagingfrom
amd/infra/vkallesh/ensure-automerge

Conversation

@vkallesh

@vkallesh vkallesh commented Jul 7, 2026

Copy link
Copy Markdown
Collaborator

Summary

This change improves the reliability of the merge-main-into-amd-staging workflow by ensuring sync PRs are automatically merged once both required conditions are satisfied, regardless of which occurs first.

Changes

  • Trigger merge evaluation on both Multi-Arch CI completion and PR approval.
  • Re-validate mandatory gating checks and approval before performing the admin merge.
  • Replace the fixed polling limit with a 12-hour wait window to accommodate long-running gating tests.
  • Preserve the existing direct admin merge behavior using the ROCM_CCIAPP App.
  • Simplify workflow comments for better readability and maintenance.

Motivation

Previously, the workflow only ran after the CI workflow completed, requiring manual intervention. This change ensures the workflow is re-evaluated whenever either prerequisite changes, enabling automatic merging once both requirements are met.

- Trigger auto-merge on both CI completion and PR approval
- Re-evaluate required checks and approval before merging
- Perform direct admin merge once all conditions are satisfied
- Replace fixed polling attempts with a 12-hour wait window for gating checks
- Simplify workflow documentation and comments
@vkallesh vkallesh requested a review from skganesan008 July 7, 2026 13:39
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