Skip to content

Commit 5923d9c

Browse files
authored
Update dev docs about merging PRs for Airflow 3.0 (apache#49701)
1 parent 5349d09 commit 5923d9c

File tree

1 file changed

+23
-5
lines changed

1 file changed

+23
-5
lines changed

dev/README_AIRFLOW3_DEV.md

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
- [Developing for Airflow 2.11](#developing-for-airflow-211)
3030
- [Committers / PMCs](#committers--pmcs)
3131
- [Merging PRs for providers and Helm chart](#merging-prs-for-providers-and-helm-chart)
32+
- [Merging PRs targeted for Airflow 3.0 (bugfixes/CI changes)](#merging-prs-targeted-for-airflow-30-bugfixesci-changes)
3233
- [Merging PR for Airflow 3 and 2.10.x / 2.11.x](#merging-pr-for-airflow-3-and-210x--211x)
3334
- [How to backport PR with GitHub Actions](#how-to-backport-pr-with-github-actions)
3435
- [How to backport PR with `cherry-picker` CLI](#how-to-backport-pr-with-cherry-picker-cli)
@@ -117,6 +118,27 @@ Core parts should be extracted to a separate PR.
117118
Exclusions should be pre-approved specifically with a comment by release manager.
118119
Do not treat PR approval (Green V) as exclusion approval.
119120

121+
## Merging PRs targeted for Airflow 3.0 (bugfixes/CI changes)
122+
123+
The committer who merges the PR is responsible for backporting the PRs that are 3.0 bugfixes to `v3-0-test` .
124+
It means that they should create a new PR where the original commit from main is cherry-picked and take care for resolving conflicts.
125+
If the cherry-pick is too complex, then ask the PR author / start your own PR against `v3-0-test` directly with the change.
126+
Note: tracking that the PRs merged as expected is the responsibility of committer who merged the PR.
127+
128+
Committer may also request from PR author to raise 2 PRs one against `main` branch and one against `v3-0-test` prior to accepting the code change.
129+
130+
Mistakes happen, and such backport PR work might fall through cracks. Therefore, if the committer thinks
131+
that certain PRs should be backported, they should set 3.0.x milestone for them.
132+
133+
This way release manager can verify (as usual) if all the "expected" PRs have
134+
been backported and cherry-pick remaining PRS.
135+
136+
137+
We are using `cherry-picker` - a [tool](https://github.com/python/cherry-picker) that has been developed by
138+
Python developers. It allows to easily cherry-pick PRs from one branch to another. It works both - via
139+
command line and via GitHub Actions interface.
140+
141+
120142
## Merging PR for Airflow 3 and 2.10.x / 2.11.x
121143

122144
The committer who merges the PR is responsible for backporting the PR to `v2-10-test`.
@@ -131,10 +153,6 @@ Mistakes happen, and such backport PR work might fall through cracks. Therefore,
131153
This way release manager can verify (as usual) if all the "expected" PRs have been backported and cherry-pick remaining PRS.
132154

133155

134-
We are using `cherry-picker` - a [tool](https://github.com/python/cherry-picker) that has been developed by
135-
Python developers. It allows to easily cherry-pick PRs from one branch to another. It works both - via
136-
command line and via GitHub Actions interface.
137-
138156
## How to backport PR with GitHub Actions
139157

140158
When you want to backport commit via GitHub actions (you need to be a committer), you
@@ -148,7 +166,7 @@ You can pin the workflow from the list of workflows for easy access to it.
148166
![Backport commit](images/backport_commit_action.png)
149167

150168
Use `main` as source of the workflow and copy the commit hash and enter the target branch name
151-
(e.g. `v2-10-test`).
169+
(e.g. `v2-10-test`, `v3-0-test`).
152170

153171
The action should create a new PR with the cherry-picked commit and add a comment in the PR when it is
154172
successful (or when it fails). If automatic backporting fails because of conflicts, you have to revert to

0 commit comments

Comments
 (0)