potiuk commented on a change in pull request #13813:
URL: https://github.com/apache/airflow/pull/13813#discussion_r562054141
##########
File path: CONTRIBUTING.rst
##########
@@ -383,24 +383,40 @@ Airflow Git Branches
====================
All new development in Airflow happens in the ``master`` branch. All PRs
should target that branch.
-We also have a ``v1-10-test`` branch that is used to test ``1.10.x`` series of
Airflow and where committers
+
+
+We also have a ``v2-0-test`` branch that is used to test ``2.0.x`` series of
Airflow and where committers
cherry-pick selected commits from the master branch.
+
Cherry-picking is done with the ``-x`` flag.
-The ``v1-10-test`` branch might be broken at times during testing. Expect
force-pushes there so
-committers should coordinate between themselves on who is working on the
``v1-10-test`` branch -
+The ``v2-0-test`` branch might be broken at times during testing. Expect
force-pushes there so
+committers should coordinate between themselves on who is working on the
``v2-0-test`` branch -
usually these are developers with the release manager permissions.
-Once the branch is stable, the ``v1-10-stable`` branch is synchronized with
``v1-10-test``.
-The ``v1-10-stable`` branch is used to release ``1.10.x`` releases.
+The ``v2-0-stable`` branch is rather stable - there are minimum changes coming
from approved PRs that
+passed the tests. This means that the branch is rather, well, "stable".
+
+Once the branch is stable, the ``v2-0-stable`` branch is synchronized with
``v2-0-test``.
+The ``v2-0-stable`` branch is used to release ``2.0.x`` releases.
The general approach is that cherry-picking a commit that has already had a PR
and unit tests run
-against main is done to ``v1-10-test`` branch, but PRs from contributors
towards 1.10 should target
-``v1-10-stable`` branch.
+against main is done to ``v2-0-test`` branch, but PRs from contributors
towards 2.0 should target
+``v2-0-stable`` branch.
-The ``v1-10-test`` branch and ``v1-10-stable`` ones are merged just before the
release and that's the
+The ``v2-0-test`` branch and ``v2-0-stable`` ones are merged just before the
release and that's the
time when they converge.
+The production images are build in DockerHub from:
+
+* master branch for development
+* v2-0-test branch for testing 2.0.x release
+* 2.0.0*, 2.0.0rc* releases from the ``v2-0-stable`` branch when we prepare
release candidates and
Review comment:
Updated it with ``
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
