-
Notifications
You must be signed in to change notification settings - Fork 4k
change default branch from 'master' to 'main' #7287
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
Changes from all commits
fa8a553
dc2fba8
d142e18
32a9290
45ac743
a1d198e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,9 +5,10 @@ name: Build | |
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - main | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| - master | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similar question: aren't all PRs immediately rebased after rename?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @guolinke asked that we preserve GitHub handles a lot with renaming (https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch), but the renaming does not extend to SSH-base git clones $ git clone --branch master git@github.com:dask/distributed.git
Cloning into 'distributed'...
fatal: Remote branch master not found in upstream originBut thinking about it some more, renaming via GitHub's feature for that (https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch) would be easier and seems like it's handle most redirections. And I guess anyone directly trying to clone from @guolinke could you read that link and let me know if it'd be ok to rename I guess this is what other projects have done, e.g. if you go to https://github.com/dask/distributed/tree/master you'll be redirected to https://github.com/dask/distributed/tree/main.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, I'd be strongly in favor of renaming via GitHub's dedicated feature 😅
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've asked @guolinke for his opinion in the private maintainer chat too. Hoping we can come to an agreement here and resolve this to make it part of the v4.7.0 release. I know he's busy with other things and may be hard to reach. If we don't hear back by July 25 (that'll have been 2 months), I'm comfortable moving forward with the "renaming" option and with the release. I always want to defer to Guolin's opinion on major things like this affecting the project, but we also need to keep the project moving forward and he already approved making the default branch
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hey @borchero , Guolin approved doing the rename privately, so I'm ready to move forward with that approach. Thanks for the nudge! I still think we need these I've also updated the plan in the "Approach" section of #7034 Could you take another look here and approve if you think the PR has all the changes we'd want on the default branch before making the switch? Once you approve this, I'll merge it and work on all the other steps. And then we could hopefully be ready to do the release as soon as this week 😁 |
||
|
|
||
| # automatically cancel in-progress builds if another commit is pushed | ||
|
|
||
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.
Why do we keep master here?
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.
I believe we need it for CI on this PR to still be triggered.
So it could be removed as soon as this is merged and the default branch switches to
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.
I've put up a follow-up removing these: #7353