You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2020/01/16 20:59:38 UTC
[GitHub] [airflow] potiuk opened a new pull request #7193: [AIRFLOW-XXXX]
Adds branching strategy to documentation
potiuk opened a new pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193
---
Issue link: WILL BE INSERTED BY [boring-cyborg](https://github.com/kaxil/boring-cyborg)
Make sure to mark the boxes below before creating PR: [x]
- [x] Description above provides context of the change
- [x] Commit message/PR title starts with `[AIRFLOW-NNNN]`. AIRFLOW-NNNN = JIRA ID<sup>*</sup>
- [x] Unit tests coverage for changes (not needed for documentation changes)
- [x] Commits follow "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)"
- [x] Relevant documentation is updated including usage instructions.
- [x] I will engage committers as explained in [Contribution Workflow Example](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#contribution-workflow-example).
<sup>*</sup> For document-only changes commit message can start with `[AIRFLOW-XXXX]`.
---
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
Read the [Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines) for more information.
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [airflow] potiuk commented on a change in pull request #7193:
[AIRFLOW-XXXX] Adds branching strategy to documentation
Posted by GitBox <gi...@apache.org>.
potiuk commented on a change in pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193#discussion_r367877599
##########
File path: CONTRIBUTING.rst
##########
@@ -152,6 +152,21 @@ these guidelines:
- Adhere to guidelines for commit messages described in this `article <http://chris.beams.io/posts/git-commit/>`__.
This makes the lives of those who come after you a lot easier.
+Airflow Git Branches
+====================
+
+All new development in Airflow happens in ``master`` branch. All PRs should target that branch.
+We also have ``v1-10-test`` branch which is used to test ``1.10.x`` series of Airflow and where committers
+(and only committers) cherry-pick selected commits from the master branch.
+Cherry-picking is done with -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 -
+usually those will be people with the role of the release manager.
+
+Once the branch is stable - the ``v1-10-stable`` branch is synchronized with ``v1-10-test``.
+The ``v1-10-stable`` branch is used to relsease ``1.10.x`` releases.
Review comment:
Ups
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [airflow] potiuk merged pull request #7193: [AIRFLOW-XXXX] Adds
branching strategy to documentation
Posted by GitBox <gi...@apache.org>.
potiuk merged pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [airflow] zhongjiajie commented on a change in pull request #7193:
[AIRFLOW-XXXX] Adds branching strategy to documentation
Posted by GitBox <gi...@apache.org>.
zhongjiajie commented on a change in pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193#discussion_r367751853
##########
File path: CONTRIBUTING.rst
##########
@@ -152,6 +152,17 @@ these guidelines:
- Adhere to guidelines for commit messages described in this `article <http://chris.beams.io/posts/git-commit/>`__.
This makes the lives of those who come after you a lot easier.
+Airflow Git Branches
+====================
+
+All new development in Airflow happens in ``master`` branch. All PRs should target that branch.
+We also have ``v1-10-test`` branch which is used to test ``1.10.x`` series of Airflow and where committers
+(and only committers) cherry-pick selected commits from the master branch. The ``v1-10-test`` branch might be
Review comment:
Should we add hint only use `cherry-pick -x` from master? And should we also add this in https://github.com/apache/airflow/blob/master/.github/PULL_REQUEST_TEMPLATE.md check list? For more direct hint to contributor
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [airflow] potiuk commented on a change in pull request #7193:
[AIRFLOW-XXXX] Adds branching strategy to documentation
Posted by GitBox <gi...@apache.org>.
potiuk commented on a change in pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193#discussion_r367783481
##########
File path: CONTRIBUTING.rst
##########
@@ -152,6 +152,17 @@ these guidelines:
- Adhere to guidelines for commit messages described in this `article <http://chris.beams.io/posts/git-commit/>`__.
This makes the lives of those who come after you a lot easier.
+Airflow Git Branches
+====================
+
+All new development in Airflow happens in ``master`` branch. All PRs should target that branch.
+We also have ``v1-10-test`` branch which is used to test ``1.10.x`` series of Airflow and where committers
+(and only committers) cherry-pick selected commits from the master branch. The ``v1-10-test`` branch might be
Review comment:
I think it's ok as it is now wit PR template - the template is shown AFTER you make PR already and master is default branch - you'd have to make a deliberate effort to change the PR target branch, and by that time you probably read about branching strategy :).
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [airflow] feluelle commented on a change in pull request #7193:
[AIRFLOW-XXXX] Adds branching strategy to documentation
Posted by GitBox <gi...@apache.org>.
feluelle commented on a change in pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193#discussion_r367875639
##########
File path: CONTRIBUTING.rst
##########
@@ -152,6 +152,21 @@ these guidelines:
- Adhere to guidelines for commit messages described in this `article <http://chris.beams.io/posts/git-commit/>`__.
This makes the lives of those who come after you a lot easier.
+Airflow Git Branches
+====================
+
+All new development in Airflow happens in ``master`` branch. All PRs should target that branch.
+We also have ``v1-10-test`` branch which is used to test ``1.10.x`` series of Airflow and where committers
+(and only committers) cherry-pick selected commits from the master branch.
+Cherry-picking is done with -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 -
+usually those will be people with the role of the release manager.
+
+Once the branch is stable - the ``v1-10-stable`` branch is synchronized with ``v1-10-test``.
+The ``v1-10-stable`` branch is used to relsease ``1.10.x`` releases.
Review comment:
```suggestion
The ``v1-10-stable`` branch is used to release ``1.10.x`` releases.
```
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [airflow] feluelle commented on issue #7193: [AIRFLOW-XXXX] Adds
branching strategy to documentation
Posted by GitBox <gi...@apache.org>.
feluelle commented on issue #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193#issuecomment-575581137
Thanks for this 👍 - quality of life improvement :P
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [airflow] potiuk commented on a change in pull request #7193:
[AIRFLOW-XXXX] Adds branching strategy to documentation
Posted by GitBox <gi...@apache.org>.
potiuk commented on a change in pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193#discussion_r367783100
##########
File path: CONTRIBUTING.rst
##########
@@ -152,6 +152,17 @@ these guidelines:
- Adhere to guidelines for commit messages described in this `article <http://chris.beams.io/posts/git-commit/>`__.
This makes the lives of those who come after you a lot easier.
+Airflow Git Branches
+====================
+
+All new development in Airflow happens in ``master`` branch. All PRs should target that branch.
+We also have ``v1-10-test`` branch which is used to test ``1.10.x`` series of Airflow and where committers
+(and only committers) cherry-pick selected commits from the master branch. The ``v1-10-test`` branch might be
Review comment:
Good point. I reworded it slightly and added -x
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [airflow] zhongjiajie commented on a change in pull request #7193:
[AIRFLOW-XXXX] Adds branching strategy to documentation
Posted by GitBox <gi...@apache.org>.
zhongjiajie commented on a change in pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193#discussion_r367751853
##########
File path: CONTRIBUTING.rst
##########
@@ -152,6 +152,17 @@ these guidelines:
- Adhere to guidelines for commit messages described in this `article <http://chris.beams.io/posts/git-commit/>`__.
This makes the lives of those who come after you a lot easier.
+Airflow Git Branches
+====================
+
+All new development in Airflow happens in ``master`` branch. All PRs should target that branch.
+We also have ``v1-10-test`` branch which is used to test ``1.10.x`` series of Airflow and where committers
+(and only committers) cherry-pick selected commits from the master branch. The ``v1-10-test`` branch might be
Review comment:
Should we add hint only use `cherry-pick -x` from master? And should we also add this in https://github.com/apache/airflow/blob/master/.github/PULL_REQUEST_TEMPLATE.md ?
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
[GitHub] [airflow] zhongjiajie commented on a change in pull request #7193:
[AIRFLOW-XXXX] Adds branching strategy to documentation
Posted by GitBox <gi...@apache.org>.
zhongjiajie commented on a change in pull request #7193: [AIRFLOW-XXXX] Adds branching strategy to documentation
URL: https://github.com/apache/airflow/pull/7193#discussion_r367751853
##########
File path: CONTRIBUTING.rst
##########
@@ -152,6 +152,17 @@ these guidelines:
- Adhere to guidelines for commit messages described in this `article <http://chris.beams.io/posts/git-commit/>`__.
This makes the lives of those who come after you a lot easier.
+Airflow Git Branches
+====================
+
+All new development in Airflow happens in ``master`` branch. All PRs should target that branch.
+We also have ``v1-10-test`` branch which is used to test ``1.10.x`` series of Airflow and where committers
+(and only committers) cherry-pick selected commits from the master branch. The ``v1-10-test`` branch might be
Review comment:
Should we add hint only use `cherry-pick -x` from master? And should we also add this in https://github.com/apache/airflow/blob/master/.github/PULL_REQUEST_TEMPLATE.md check list?
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services