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/10/12 09:12:51 UTC
[GitHub] [airflow] potiuk opened a new pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
potiuk opened a new pull request #11461:
URL: https://github.com/apache/airflow/pull/11461
There was an unwritten rule about v1-10-test vs. v1-10-stble
branches that some people followed but it was not documented nor
expressed in any way.
This PR adds a paragraph explaining the general rule and what
is happening with the branches.
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
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).
----------------------------------------------------------------
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
[GitHub] [airflow] potiuk commented on pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#issuecomment-707002653
> Does this mean that whole work for airflow upgrade_check should be cherrypicked to v1-10-stable and next PR should be opened to that branch?
I think that would be great if we would like to continue PRs. v1-10-test gets broken more often the closer we get to release and sometimes it takes days to fix it
----------------------------------------------------------------
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
[GitHub] [airflow] ashb commented on pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
ashb commented on pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#issuecomment-707028558
> @ashb @kaxil what do you think about fixing v1-10-test and rebasing v1-10-stable on top of it so that @turbaszek does not have to cherry-pick those changes ? This would also likely help with stability of v-1-10-test/stable CI.
I'd rather we never force-push v1-10-stable as a general rule. It does happen some times, but so long as it we don't force-push to change a tag that's okay.
----------------------------------------------------------------
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
[GitHub] [airflow] potiuk edited a comment on pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
potiuk edited a comment on pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#issuecomment-707003903
And Sorry @turbaszek I only tell it now - I should have realised it before, but I've been kinda busy :(. I will be cherry-picking the test split to v1-10-test today and try to fix it.
@ashb @kaxil what do you think about fixing v1-10-test and rebasing v1-10-stable on top of it so that @turbaszek does not have to cherry-pick those changes ? This would also likely help with stability of v-1-10-test/stable CI.
----------------------------------------------------------------
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
[GitHub] [airflow] potiuk commented on pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#issuecomment-707003903
And Sorry @turbaszek I only tell it now - I should have realised it before, but I've been kinda busy :(. I will be cherry-picking the test split to v1-10-test today and try to fix it.
@ashb @kaxil what do you think about fixing v1-10-test and rebasing v1-10-stable on top of it so that @turbaszek does not have to cherry-pick those changes ?
----------------------------------------------------------------
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
[GitHub] [airflow] potiuk commented on pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#issuecomment-707843411
@ashb? Low prio, but low effort as well :)
----------------------------------------------------------------
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
[GitHub] [airflow] potiuk commented on pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#issuecomment-707033710
I was thinking more about rebasing cherry-picking the whole v1-10-test on top of the v1-10-stable and fast-forwarding the v1-10-stable branch after it gets green. How about this?
----------------------------------------------------------------
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
[GitHub] [airflow] potiuk merged pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
potiuk merged pull request #11461:
URL: https://github.com/apache/airflow/pull/11461
----------------------------------------------------------------
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
[GitHub] [airflow] potiuk commented on pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
potiuk commented on pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#issuecomment-706992504
hey @ashb @kaxil -> I've heard about this rule about PR vs. cherry-pick from you but I don't think it has ever been documented. Can you please confirm if understand the rule correctly?
----------------------------------------------------------------
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
[GitHub] [airflow] ashb commented on a change in pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
ashb commented on a change in pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#discussion_r503155164
##########
File path: CONTRIBUTING.rst
##########
@@ -371,6 +371,12 @@ 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 general approach is that cherry-picking is done to ``v1-10-test`` branch, but PRs from contributors
+towards 1.10 should target ``v1-10-stable`` branch.
Review comment:
```suggestion
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.
```
----------------------------------------------------------------
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
[GitHub] [airflow] turbaszek commented on pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
turbaszek commented on pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#issuecomment-706994230
Does this mean that whole work for airflow upgrade_check should be cherrypicked to v1-10-stable and next PR should be opened to that branch?
----------------------------------------------------------------
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
[GitHub] [airflow] kaxil commented on pull request #11461: Clarify the v1-10-test vs. v1-10-stable branch
Posted by GitBox <gi...@apache.org>.
kaxil commented on pull request #11461:
URL: https://github.com/apache/airflow/pull/11461#issuecomment-707039357
> I was thinking more about rebasing cherry-picking the whole v1-10-test on top of the v1-10-stable and fast-forwarding the v1-10-stable branch after it gets green. How about this?
I would say we won't rebase until we are sure it won't change (i.e. once we are close to cutting rc's) mainly because from time to time we would force-push v1-10-test which will make v1-10-stable outdated the 2nd time
----------------------------------------------------------------
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