Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run constraint branch checkout in non-canary build #35088

Merged

Conversation

potiuk
Copy link
Member

@potiuk potiuk commented Oct 20, 2023

The constraint branch checkout needs to happen always when there is an "upgrade-to-newer-dependencies" build, not only wnen there is a "canary" main build, Otherwise when we attempt to update to diff constraints vs. the current ones the diff fails.

Only the Commit and Push which are the folowing steps should happen exclusively in the canary run.


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in newsfragments.

The constraint branch checkout needs to happen always when there
is an "upgrade-to-newer-dependencies" build, not only wnen there
is a "canary" main build, Otherwise when we attempt to update to
diff constraints vs. the current ones the diff fails.

Only the Commit and Push which are the folowing steps should
happen exclusively in the canary run.
@potiuk
Copy link
Member Author

potiuk commented Oct 20, 2023

This caused failure in #35085

Copy link
Member

@hussein-awala hussein-awala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense!

@potiuk potiuk merged commit 570d88b into apache:main Oct 20, 2023
18 checks passed
@potiuk potiuk deleted the also-checkout-constraint-repo-in-non-canary-build branch October 20, 2023 16:36
Copy link
Contributor

@amoghrajesh amoghrajesh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me!

potiuk added a commit that referenced this pull request Oct 29, 2023
The constraint branch checkout needs to happen always when there
is an "upgrade-to-newer-dependencies" build, not only wnen there
is a "canary" main build, Otherwise when we attempt to update to
diff constraints vs. the current ones the diff fails.

Only the Commit and Push which are the folowing steps should
happen exclusively in the canary run.

(cherry picked from commit 570d88b)
@potiuk potiuk added the changelog:skip Changes that should be skipped from the changelog (CI, tests, etc..) label Oct 29, 2023
@potiuk potiuk added this to the Airflow 2.7.3 milestone Oct 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:dev-tools changelog:skip Changes that should be skipped from the changelog (CI, tests, etc..)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants