o-nikolas commented on code in PR #75142: URL: https://github.com/apache/airflow/pull/75142#discussion_r4338844542
########## dev/README_AIRFLOW3_DEV.md: ########## @@ -179,6 +180,41 @@ PRs should **never** target `v2-11-stable` directly unless explicitly instructed The following sections explains the protocol for merging PRs. +## Auto-merge + +Auto-merge is enabled for PRs targeting `main`. Instead of waiting for CI to finish, approve the PR and +click **Enable auto-merge** (or run `gh pr merge <number> --squash --auto`). GitHub squash-merges the PR +as soon as it has an approval, its conversations are resolved and the required checks are green. Any +committer can cancel it with **Disable auto-merge**. A push by the PR author (or anyone else without +write access) disables auto-merge, so the author cannot change the PR after you approved it; review the +new commits and enable it again. Pushes by committers keep it enabled. + +Auto-merge is enabled for the whole repository, so every branch that PRs target requires CI. The +"Require CI on release branches" ruleset requires **CI passed** on the release, providers, chart and +`airflow-ctl` branches. A release branch gets the **CI passed** job only once it is backported there; until +then, its PRs never report the check, and a committer merges them by bypassing the rule. Backport the job to +the active release branches when this lands. + +The `main` ruleset requires two checks. **CI passed** is a job in the `Tests (AMD)` workflow that always Review Comment: It looks like arm as well, judging by the PR changes? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
