Nice! I just tried out the auto-merge feature in https://github.com/apache/airflow/pull/73820 and it worked smoothly.
Thanks & Regards Jason On Sat, Oct 24, 2026 at 8:55 PM Jarek Potiuk <[email protected]> wrote: > Hello everyone, > > Following the lazy consensus [1], auto-merge is now enabled for PRs to > main (#75142 [2]). > > How to use it: approve the PR, then click "Enable auto-merge" (or run > `gh pr merge <number> --squash --auto`). GitHub squash-merges it once it > is approved, its conversations are resolved and the required checks are > green. A push by the PR author disables auto-merge, so the author cannot > change the PR after your approval; review the new commits and enable it > again. > > What it waits for: two required checks, "CI passed" and > "check-newsfragment-pr-number". "CI passed" is a new job in the Tests > (AMD) workflow that fails when any other CI job failed or was cancelled; > jobs skipped by selective checks count as passed. It does not wait for > CodeQL, Dependency review or Registry tests, so look at those before > enabling auto-merge on a PR that runs them. > > A PR that changes .github/workflows/ runs its own copy of the gate, > so review such changes before enabling auto-merge. All PRs that > are coming from external contributors that change workflows will > unconditionally wait for "workflow approval" - and will get "require > workflow approval" label automatically after we merge self-hosted > changes (we are waiting with Shahar for Jira ticket [5] to be addresse). > > Upvotes on the JIRA or my PR that adds immutable identity option > to .asf.yaml [6] are most welcome. > > Bypass: when CI is red for a reason unrelated to the PR (for example a > test that is broken on main), committers can still merge by ticking > "Merge without waiting for requirements to be met (bypass rules)" in the > merge box - see the screenshot [3]. > > Use it only when you are sure the failure is not caused by the PR, > and say so in a comment. The bypass is > granted to the repository's Write role, which on our repository only > committers hold, so new committers get it as soon as they are added - > nothing to update. (We could not use the airflow-committers team: it is > secret, and GitHub does not accept secret teams as bypass actors.) > > Release branches: "CI passed" is also required on the v*-test, > v*-stable, providers, chart and airflow-ctl branches. Until the gate job > is backported to a release branch, PRs to it never report the check, so > committers merge them with the bypass. I am backporting it now. > > More details are in the committer docs [4]. > > [1] https://lists.apache.org/thread/5x43zx0xtwokvm0o7jm9yw5lyhmgqxm8 > [2] https://github.com/apache/airflow/pull/75142 > [3] > https://github.com/user-attachments/assets/30e4eb4a-99b3-4d5b-8a25-e9313106af9f > [4] > https://github.com/apache/airflow/blob/main/dev/README_AIRFLOW3_DEV.md#auto-merge > [5] https://issues.apache.org/jira/browse/INFRA-28575 > [6] https://github.com/apache/infrastructure-asfyaml/pull/141 > > J. > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > >
