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

Switch default branch to main #2173

Closed
waitingkuo opened this issue Jul 26, 2022 · 13 comments · Fixed by #6795
Closed

Switch default branch to main #2173

waitingkuo opened this issue Jul 26, 2022 · 13 comments · Fixed by #6795
Labels
enhancement Any new improvement worthy of a entry in the changelog

Comments

@waitingkuo
Copy link
Contributor

Is your feature request related to a problem or challenge? Please describe what you are trying to do.

As discussed in https://lists.apache.org/thread/olhpz7mxh597t7qf5h25xpg97hy9os4t

Describe the solution you'd like

Switch the default branch from master to main
Keep master branch up to date for a while, add some deprecation notification in the master branch

@waitingkuo waitingkuo added the enhancement Any new improvement worthy of a entry in the changelog label Jul 26, 2022
@HaoYang670
Copy link
Contributor

Maybe also do this change in Datafusion and Ballista.

@assignUser
Copy link
Member

assignUser commented Dec 2, 2022

Keep master branch up to date for a while, add some deprecation notification in the master branch

This is not necessary, github will forward master to the new default branch and a bunch of other stuff (from )

  • Retarget any open pull requests
  • Update any draft releases based on the branch
  • Move any branch protection rules that explicitly reference the old the branch used to build GitHub Pages, if applicable
  • Show a notice to repository contributors, maintainers, and admins on the repository homepage with instructions to update local copies of the repository
  • Show a notice to contributors who git push to the old branch
  • Redirect web requests for the old branch name to the new branch name
  • Return a "Moved Permanently" response in API requests for the old branch name

So unless there is a bunch of tooling with master hard coded (e.g the issue over in apche/arrow) renaming should be pretty painless.

@ByteBaker
Copy link
Contributor

@alamb @tustvold any plan around this?

@alamb
Copy link
Contributor

alamb commented Oct 3, 2024

I personally would appreciate having the branch changed just so it was consistent with all my other repos.

@ByteBaker
Copy link
Contributor

Apart from hard-coded names in places like CI, I think it should be relatively straightforward.

@tustvold
Copy link
Contributor

tustvold commented Oct 3, 2024

No objections from me if someone wishes to do the necessary legwork, although I will confess to finding this particular fad somewhat baffling

@ByteBaker
Copy link
Contributor

ByteBaker commented Oct 3, 2024

I'm up for making changes that go through commits. But otherwise this exercise needs someone with admin access.

Reference

@alamb
Copy link
Contributor

alamb commented Oct 4, 2024

Looks like we need to file a request with apache Infra in JIRA.

I have filed https://issues.apache.org/jira/browse/INFRA-26183 to request the change

@alamb
Copy link
Contributor

alamb commented Oct 9, 2024

Here is a mailing list thread proposing this change https://lists.apache.org/thread/x57h0fht173c9zrb02cg6plmlnr6xcc9

@alamb
Copy link
Contributor

alamb commented Nov 2, 2024

We are proceeding with this process -- please see https://issues.apache.org/jira/browse/INFRA-26183 for details. I will likely delete the master branch when that is complete.

@alamb
Copy link
Contributor

alamb commented Nov 24, 2024

This has now been completed and the repos's default branch is now main 😅

Thank you all very much.

@alamb alamb closed this as completed Nov 24, 2024
@tustvold tustvold reopened this Nov 24, 2024
@tustvold
Copy link
Contributor

At least some work remains here, e.g updating the branch protection rules.

https://github.com/apache/arrow-rs/blob/main/.asf.yaml

@alamb
Copy link
Contributor

alamb commented Nov 25, 2024

At least some work remains here, e.g updating the branch protection rules.

https://github.com/apache/arrow-rs/blob/main/.asf.yaml

Proposed fix:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Any new improvement worthy of a entry in the changelog
Projects
None yet
Development

Successfully merging a pull request may close this issue.

6 participants