eladkal commented on code in PR #41457: URL: https://github.com/apache/airflow/pull/41457#discussion_r1721055214
########## dev/README_AIRFLOW3_DEV.md: ########## @@ -0,0 +1,114 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<!-- START doctoc generated TOC please keep comment here to allow auto update --> +<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> +**Table of contents** + +- [Main branch is Airflow 3](#main-branch-is-airflow-3) +- [Contributors](#contributors) + - [Developing for providers and Helm chart](#developing-for-providers-and-helm-chart) + - [Developing for Airflow 3 and 2.10.x / 2.11.x](#developing-for-airflow-3-and-210x--211x) + - [Developing for Airflow 3](#developing-for-airflow-3) + - [Developing for Airflow 2.10.x](#developing-for-airflow-210x) + - [Developing for Airflow 2.11](#developing-for-airflow-211) +- [Committers / PMCs](#committers--pmcs) + - [Merging PRs for providers and Helm chart](#merging-prs-for-providers-and-helm-chart) + - [Merging PR for Airflow 3 and 2.10.x / 2.11.x](#merging-pr-for-airflow-3-and-210x--211x) + - [Merging PRs 2.10.x](#merging-prs-210x) + - [Merging PRs for Airflow 3](#merging-prs-for-airflow-3) + - [Merging PRs for Airflow 2.11](#merging-prs-for-airflow-211) + +<!-- END doctoc generated TOC please keep comment here to allow auto update --> + +# Main branch is Airflow 3 + +The main branch is for development of Airflow 3. +Airflow 2.10.x releases will be cut from `v-2-10-stable` branch. + +# Contributors + +The following section explains which branches you should target your PR to + +## Developing for providers and Helm chart + +PRs should target `main` branch. +Make sure your code is only about Providers or Helm chart. +Avoid mixing core changes into the same PR + +## Developing for Airflow 3 and 2.10.x / 2.11.x + +If the PR is relevant for both Airflow 3 and 2 it should target `main` branch. + +## Developing for Airflow 3 + +PRs should target `main` branch. + +## Developing for Airflow 2.10.x + +PR should target `v-2-10-test` branch. When cutting a new release for 2.10 release manager +will sync `v-2-10-test` branch to `v-2-10-stable` and cut the release from the stable branch. +PR should never target `v-2-10-stable` unless specifically instructed by release manager. + +## Developing for Airflow 2.11 + +Version 2.11 is planned to be cut from `v-2-10-stable` branch. Review Comment: To my understanding 2.11 is meant to be bridge release... Thus it will not have features other than what is needed for the bridge functionality. Thus cutting it from 2.10 branch make sense. -- 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
