-
Notifications
You must be signed in to change notification settings - Fork 16.3k
Prepare to rename master branch for main. #14688
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
Conversation
|
The Workflow run is cancelling this PR. Building images for the PR has failed. Follow the workflow link to check the reason. |
|
Need to work out how to make this pass with scripts from master but Dockerfile from this branch. |
|
The Workflow run is cancelling this PR. Building images for the PR has failed. Follow the workflow link to check the reason. |
|
The Workflow run is cancelling this PR. Building images for the PR has failed. Follow the workflow link to check the reason. |
There are many more references to "master" (even in our own repo) than this, but this commit is the first step: to that process. It makes CI run on the main branch (once it exists), re-words a few cases where we can to easily not refer to master anymore. This doesn't yet re-name the `constraints-master` or `master-*` images - that will be done in a future PR. (We don't be able to entirely eliminate "master" from our repo as we refer to a lot of other GitHub repos that we can't change.)
1bbfe8f to
28b3126
Compare
| raise Exception(f"Could not find provider.yaml file for package: {PACKAGE_NAME}") | ||
| PACKAGE_DIR = CURRENT_PROVIDER['package-dir'] | ||
| PACKAGE_VERSION = 'master' | ||
| PACKAGE_VERSION = 'devel' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wait are we naming it devel or main ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would good to have the same name in the docs as the branch name
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Branch was going to be main, I was thinking that "main" in the docs isn't clear enough though.
It appears we don't actually show this anywhere though, so it's probably moot?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can change it if you'd like
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah since we don't use RTD, it does matter I guess
|
The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest master at your convenience, or amend the last commit of the PR, and push it with --force-with-lease. |
There are many more references to "master" (even in our own repo) than this, but this commit is the first step: to that process. It makes CI run on the main branch (once it exists), re-words a few cases where we can to easily not refer to master anymore. This doesn't yet re-name the `constraints-master` or `master-*` images - that will be done in a future PR. (We don't be able to entirely eliminate "master" from our repo as we refer to a lot of other GitHub repos that we can't change.) (cherry picked from commit 0dea083)
There are many more references to "master" (even in our own repo) than this, but this commit is the first step: to that process. It makes CI run on the main branch (once it exists), re-words a few cases where we can to easily not refer to master anymore. This doesn't yet re-name the `constraints-master` or `master-*` images - that will be done in a future PR. (We don't be able to entirely eliminate "master" from our repo as we refer to a lot of other GitHub repos that we can't change.) (cherry picked from commit 0dea083)
Part of #12982
There are many more references to "master" (even in our own repo) than
this, but this commit is the first step: to that process.
It makes CI run on the main branch (once it exists), re-words a few
cases where we can to easily not refer to master anymore.
This doesn't yet re-name the
constraints-masterormaster-*images -that will be done in a future PR.
(We don't be able to entirely eliminate "master" from our repo as we
refer to a lot of other GitHub repos that we can't change.)
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code change, 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 UPDATING.md.