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

Rename master to main on cucumber repos #1507

Closed
16 tasks done
davidjgoss opened this issue Apr 30, 2021 · 21 comments
Closed
16 tasks done

Rename master to main on cucumber repos #1507

davidjgoss opened this issue Apr 30, 2021 · 21 comments
Labels
✨ kaizen Continuous improvement initiatives. See https://github.com/orgs/cucumber/projects/9

Comments

@davidjgoss
Copy link
Contributor

davidjgoss commented Apr 30, 2021

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

https://github.com/github/renaming

  • cucumber-js
  • cucumber-jvm
  • cucumber-ruby
    • cucumber-ruby-core
    • cucumber-ruby-wire
    • cucumber-ruby
    • cucumber-ruby-meta
  • docs (will need to change Netlify config)
  • godog
  • cucumber/common
  • cucumber-cpp
  • cucumber-rails
  • cucumber-electron
  • cucumber-eclipse
  • cucumber-android
  • cucumber.ml

cc @mattwynne

@mattwynne mattwynne added the ✨ kaizen Continuous improvement initiatives. See https://github.com/orgs/cucumber/projects/9 label Apr 30, 2021
mattwynne added a commit to cucumber/cucumber-ruby-core that referenced this issue May 1, 2021
@mattwynne
Copy link
Member

@jaysonesmith can you help with godog?

@mattwynne
Copy link
Member

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
Copy link
Member

@mxygem
Copy link
Member

mxygem commented May 1, 2021

@jaysonesmith can you help with godog?

Absolutely!

@mxygem
Copy link
Member

mxygem commented May 6, 2021

@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 mattwynne added this to In Progress in Cucumber Open May 6, 2021
@mattwynne
Copy link
Member

mattwynne commented May 6, 2021

@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
Copy link
Member

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
Copy link
Member

mxygem commented May 6, 2021

godog is done! 🎉

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

Thanks for the role update @mattwynne

@mattwynne
Copy link
Member

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

@luke-hill
Copy link
Contributor

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

@davidjgoss
Copy link
Contributor Author

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

@mattwynne
Copy link
Member

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
Copy link
Contributor Author

cucumber-js done!

@mvz
Copy link
Contributor

mvz commented May 14, 2021

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 😕

@mvz
Copy link
Contributor

mvz commented May 14, 2021

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

@mattwynne
Copy link
Member

@aslakhellesoy I'm wondering if it makes sense to do #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 added a commit that referenced this issue May 20, 2021
@mattwynne
Copy link
Member

cucumber-electron and cucumber-cpp are done.

@mattwynne
Copy link
Member

I've raised an issue in cucumber-eclipse. It looks like renaming the branch could break their CI. cucumber/cucumber-eclipse#433

@mattwynne
Copy link
Member

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

@mattwynne
Copy link
Member

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

Cucumber Open automation moved this from In Progress to Implemented May 21, 2021
@mattwynne mattwynne moved this from Implemented to Released in Cucumber Open May 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
✨ kaizen Continuous improvement initiatives. See https://github.com/orgs/cucumber/projects/9
Projects
Archived in project
Development

No branches or pull requests

5 participants