cucumber / common

A home for issues that are common to multiple cucumber repositories
https://cucumber.io/docs
MIT License
3.36k stars 695 forks source link

Rename master to main on cucumber repos #1507

Closed davidjgoss closed 3 years ago

davidjgoss commented 3 years ago

Small step for inclusivity. Already been done on cucumber-jvm.

https://github.com/github/renaming

cc @mattwynne

mattwynne commented 3 years ago

@jaysonesmith can you help with godog?

mattwynne commented 3 years ago

For people with a local checkout, here's the steps you need to take:

# Switch to the "master" branch:
$ git checkout master

# Rename it to "main":
$ git branch -m master main

# Get the latest commits (and branches!) from the remote:
$ git fetch

# Remove the existing tracking connection with "origin/master":
$ git branch --unset-upstream

# Create a new tracking connection with the new "origin/main" branch:
$ git branch -u origin/main
mattwynne commented 3 years ago

https://www.hanselman.com/blog/easily-rename-your-git-default-branch-from-master-to-main

mxygem commented 3 years ago

@jaysonesmith can you help with godog?

Absolutely!

mxygem commented 3 years ago

@mattwynne I've gone through godog to update the branch and text references to main but it appears I may not have the permissions needed to actually update the repo on the GH side anymore. GH wants me to try making a PR. 😅

mattwynne commented 3 years ago

@jaysonesmith so you mean it wouldn't let you change the default branch? Or something else?

I've changed your org role from Member to Owner, so I think you should be good now. Please use your new powers responsibly :)

mattwynne commented 3 years ago

I discovered that renaming the branch using GitHub's UI (in /settings/branches) is probably the way to go. It automatically updates any PRs against the old branch, and displays a message to users letting them what to do to update their settings.

mxygem commented 3 years ago

godog is done! 🎉

Screen Shot 2021-05-06 at 12 27 17 PM

Thanks for the role update @mattwynne

mattwynne commented 3 years ago

@luke-hill could you take care of cucumber-rails?

luke-hill commented 3 years ago

Think I have same issue as Jayson. Not got the 🔋

davidjgoss commented 3 years ago

@mattwynne I lack the permissions on cucumber-js as well.

mattwynne commented 3 years ago

OK @luke-hill @davidjgoss I think neither of you had been added to the @cucumber/core team in github. I've fixed that - can you try again now?

davidjgoss commented 3 years ago

cucumber-js done!

mvz commented 3 years ago

Looks like someone went ahead and did this for Aruba too. Not against it per se, but a little surprised that I wasn't notified :confused:

mvz commented 3 years ago

A pull request would have been nice since the Aruba documentation refers to master all over the place :disappointed:.

mattwynne commented 3 years ago

@aslakhellesoy I'm wondering if it makes sense to do https://github.com/cucumber/common/issues/1550 before tackling the monorepo, as the subrepo stuff feels like the risky part of doing this on the monorepo, and the less of it there is to have to fix if it breaks, the better. WDYT?

mattwynne commented 3 years ago

These are the remaining repos that have master as default branch:

https://github.com/cucumber/aruba-getting-started https://github.com/cucumber/aruba-website https://github.com/cucumber/commitbit https://github.com/cucumber/cucumber-android https://github.com/cucumber/cucumber-classroom https://github.com/cucumber/cucumber-cpp https://github.com/cucumber/cucumber-eclipse https://github.com/cucumber/cucumber-eclipse-update-site https://github.com/cucumber/cucumber-eclipse-update-site-snapshot https://github.com/cucumber/cucumber-electron https://github.com/cucumber/cucumber-js-package-upgrade https://github.com/cucumber/cucumber-json-testdata-generator https://github.com/cucumber/cucumber-lua https://github.com/cucumber/cucumber-message-upload-service https://github.com/cucumber/cucumber-ruby-tcl https://github.com/cucumber/cucumber-tcl-wire https://github.com/cucumber/cucumber.io-file-generator https://github.com/cucumber/cucumber.ml https://github.com/cucumber/git-subrepo https://github.com/cucumber/github-issue-stats https://github.com/cucumber/microdata https://github.com/cucumber/multi_test https://github.com/cucumber/protobuf https://github.com/cucumber/protobuf.js https://github.com/cucumber/repo-template https://github.com/cucumber/slack-invite-automation https://github.com/cucumber/todo-react-typescript-subsecond

mattwynne commented 3 years ago

cucumber-electron and cucumber-cpp are done.

mattwynne commented 3 years ago

I've raised an issue in cucumber-eclipse. It looks like renaming the branch could break their CI. https://github.com/cucumber/cucumber-eclipse/issues/433

mattwynne commented 3 years ago

I've gone ahead and done this on cucumber-android and cucumber.ml

mattwynne commented 3 years ago

I think we've reached "good enough for now" on this.