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' #1348

Open
2 of 3 tasks
sleevi opened this issue Jun 7, 2021 · 19 comments
Open
2 of 3 tasks

Rename 'master' to 'main' #1348

sleevi opened this issue Jun 7, 2021 · 19 comments
Assignees

Comments

@sleevi
Copy link
Contributor

sleevi commented Jun 7, 2021

Consistent with https://github.com/github/renaming , this should be fairly trivial.

Tasks to do:

We can add other tracking items to this, for other downstream replicators/bots. I'd tentatively suggest a date of 2021-07-14, just so that we're not tackling it around any holidays or weekends, and to give folks a chance to add dependencies to this list that should be considered.

@sleevi sleevi self-assigned this Jun 7, 2021
@sleevi
Copy link
Contributor Author

sleevi commented Jun 7, 2021

@cpu (in case you know of any other automation cases)

@dnsguru @weppos

@cpu
Copy link
Contributor

cpu commented Jun 7, 2021

@cpu (in case you know of any other automation cases)

Will double check but I believe the autopull code should Just Work with an updated convergence branch name. I don't recall hardcoding "master" anywhere.

@dnsguru
Copy link
Member

dnsguru commented Jun 7, 2021 via email

@weppos
Copy link
Member

weppos commented Jun 8, 2021

I added one item. We've done it in DNSimple for all our public/private repo, it was mostly trivial. The main challenge are hard-coded references.

My primary concern would be confirm with Mozilla that nothing will break.

@bkochendorfer
Copy link

👋 I think this may break how we currently build the project. Let me know when you want to make this change so we can coordinate and ensure the build is functioning correctly.

@dnsguru dnsguru added the ❔❔ question Open question, please look / answer / respond label Sep 20, 2021
@charliez0
Copy link

any progress👀

@simon-friedberger
Copy link
Contributor

If nobody objects I would like to do this this week or next week. @bkochendorfer how much of a heads up do you need to fix the deployment pipeline?

@simon-friedberger simon-friedberger removed the ❔❔ question Open question, please look / answer / respond label Oct 28, 2024
@simon-friedberger
Copy link
Contributor

@dnsguru @weppos It seems I do not have permission to rename the branch. Could either of you rename please, and I will make sure the deployments work?

@weppos
Copy link
Member

weppos commented Nov 6, 2024

@dnsguru @weppos It seems I do not have permission to rename the branch. Could either of you rename please, and I will make sure the deployments work?

I can make the change. Should I go ahead now, or do you want to align on a time for the change to verify?

@simon-friedberger
Copy link
Contributor

@weppos Just rename it, the rest should be trivial.

@weppos weppos assigned weppos and unassigned simon-friedberger Nov 6, 2024
@weppos
Copy link
Member

weppos commented Nov 6, 2024

Done. These are the instructions for local git repos.

git branch -m master main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a

@weppos weppos assigned simon-friedberger and unassigned weppos Nov 6, 2024
@dnsguru
Copy link
Member

dnsguru commented Nov 7, 2024 via email

@simon-friedberger
Copy link
Contributor

@dnsguru Did you update the feed address?

@dnsguru
Copy link
Member

dnsguru commented Nov 7, 2024 via email

@simon-friedberger
Copy link
Contributor

Since the feed address contains the branch name you need to update the address of the feed. I've updated the entry in the wiki where we publish that address but you still have to change the address in your feedreader.

weppos added a commit to publicsuffix/publicsuffix.org that referenced this issue Nov 7, 2024
@weppos
Copy link
Member

weppos commented Nov 7, 2024

I have a change ready to be shipped
publicsuffix/publicsuffix.org#45

Any other change required?

weppos added a commit to publicsuffix/publicsuffix.org that referenced this issue Nov 7, 2024
@weppos
Copy link
Member

weppos commented Nov 11, 2024

@simon-friedberger any other change required?

@simon-friedberger
Copy link
Contributor

simon-friedberger commented Nov 11, 2024

@simon-friedberger any other change required?

@weppos Could you please do the same for the website repository? Might as well fix them both now.

@weppos
Copy link
Member

weppos commented Nov 12, 2024

@simon-friedberger any other change required?

@weppos Could you please do the same for the website repository? Might as well fix them both now.

Sure thing. Done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

7 participants