shahar1 commented on code in PR #41058: URL: https://github.com/apache/airflow/pull/41058#discussion_r1693308184
########## README.md: ########## @@ -477,17 +477,34 @@ Generally we release `MINOR` versions of Airflow from a branch that is named aft `2.7.*` releases are released from `v2-7-stable` branch, `2.8.*` releases are released from `v2-8-stable` branch, etc. -Most of the time in our release cycle, when the branch for next `MINOR` branch is not yet created, all +1. Most of the time in our release cycle, when the branch for next `MINOR` branch is not yet created, all PRs merged to `main` (unless they get reverted), will find their way to the next `MINOR` release. For example if the last release is `2.7.3` and `v2-8-stable` branch is not created yet, the next `MINOR` release -is `2.8.0` and all PRs merged to main will be released in `2.8.0`. There is a brief period of time when we -cut a new `MINOR` release branch and prepare the alpha, beta, RC candidates for the `2.NEXT_MINOR.0` version -where PRs merged to main will only be released in the following `MINOR` release. - -However, some PRs (bug-fixes and doc-only changes) when merged, can be cherry-picked to current `MINOR` branch -and released in the next `PATCHLEVEL` release - for example when the last released version from `v2-7-stable` -branch is `2.7.2`. Some of the PRs from main can be marked as `2.7.3` milestone by committers, the release manager -will try to cherry-pick them into the release branch. If successful, they will be released in `2.7.3`. +is `2.8.0` and all PRs merged to main will be released in `2.8.0`. However, some PRs (bug-fixes and +doc-only changes) when merged, can be cherry-picked to current `MINOR` branch and released in the +next `PATCHLEVEL` release for example `2.8.1` is already released and we are working on `2.9.0dev`, +marking a PR with `2.8.2` milestone will mean that it will be cherry-picked to `v2-8-test` branch and +released in `2.8.2rc1` and eventually in `2.8.2`. + + +2. When we prepare to the next `MINOR` release, we cut new `v2-*-test` and `v2-*-stable` branch +and prepare `alpha`, `beta` releases for the next `MINOR` version, the PRs merged to main will still be +released in the next `MINOR` release until `rc` version is cut. This is happening because the `v2-*-test` +and `v2-*-stable` branches are rebased on top of main when next `beta` and `rc` releases are prepared. +For example when we cut `2.10.0beta1` version, anything merged to main before `2.10.0rc1` is released, Review Comment: ```suggestion For example, when we cut `2.10.0beta1` version, anything merged to main before `2.10.0rc1` is released, ``` -- 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: commits-unsubscr...@airflow.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
