RE: [EXTERNAL] Fwd: Renaming the master branches

I'll migrate ImageResource today.

-----Original Message-----
From: Léonie Watson <lwatson@tetralogical.com> 
Sent: Tuesday, February 2, 2021 8:46 AM
To: public-webapps@w3.org
Subject: [EXTERNAL] Fwd: Renaming the master branches

Spec Editors: FYI.

-------- Forwarded Message --------
Subject: Renaming the master branches
Resent-Date: Tue, 02 Feb 2021 16:08:09 +0000
Resent-From: spec-prod@w3.org
Date: Tue, 2 Feb 2021 11:08:05 -0500
From: Philippe Le Hegaret <plh@w3.org>
Organisation: World Wide Web Consortium
To: spec-prod <spec-prod@w3.org>

Dear Editors,

The message was sent to team contacts for them to work on migrating the 'master' branches on GitHub.

If you're using this branch name, you should expect to hear from your team contacts in the upcoming weeks.

Thank you,

Philippe

[[

we'd like W3C to stop using the name 'master' for the GitHub branches by the April 2021 AC meeting.

Dom added the repositories that are still using this name in one of our reports:

https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fw3c.github.io%2Fvalidate-repos%2Freport.html%3Fgrouptype%3Dworkinggroup%26filter%3Ddefaultbranchismaster&amp;data=04%7C01%7Caarongu%40microsoft.com%7C7ff995c552024aea94d708d8c79a557e%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637478813095910069%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=2QZ6k3CUczXLMQ5bqTVb5C96vSy%2BRs0nSzdtjG2a8vk%3D&amp;reserved=0
(this report is updated every 6 hours)

We recommend pre-announcing the move before doing so, so that anyone who would have local copy, e.g. WG participants, will be alerted. See Atsushi announcement to Immersive Web:

https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.w3.org%2FArchives%2FPublic%2Fpublic-immersive-web-wg%2F2021Jan%2F0004.html&amp;data=04%7C01%7Caarongu%40microsoft.com%7C7ff995c552024aea94d708d8c79a557e%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637478813095910069%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=tQIJ1MfFR0wQBFRmwqbXJPOTA7mhu42xxRhc8FlECJc%3D&amp;reserved=0

You'll need to start by renaming the branch on the server (github.com) side. See later in this message on how you can do that but make sure to read this message entirely before starting any action. We recommend using 'main'. This whole process could take from 2 minutes to a lot more (if you're using CI, etc.).

Now, before you go and renaming things, understand the following 2 actions will need to be taken after the renaming is done:

1- if you are using some CI integration, those may rely on the branch name 'master'. Check your .travis.yml, github actions, scripts, respec config, etc and update appropriately. I recommend looking for the keyword 'master' to track those down, eg
  https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fw3c%2Fttml2%2Fsearch%3Fq%3Dmaster&amp;data=04%7C01%7Caarongu%40microsoft.com%7C7ff995c552024aea94d708d8c79a557e%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637478813095910069%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=%2BpTrB9ChplEQh83lryE2QHWv%2FmLuCs%2BomhGexjSbDRM%3D&amp;reserved=0

2- local copies of the repositories (yours and WG participants) will need an action as well:

 
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdocs.github.com%2Fen%2Fgithub%2Fadministering-a-repository%2Frenaming-a-branch%23updating-a-local-clone-after-a-branch-name-changes&amp;data=04%7C01%7Caarongu%40microsoft.com%7C7ff995c552024aea94d708d8c79a557e%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637478813095920024%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=EdBB3SWhO2Giy2FVcUt%2FZnZZHjp14unttY9rss5yxR0%3D&amp;reserved=0

Denis also provided:
[[
$ git checkout master
$ git branch -m master main
$ git fetch
$ git branch --unset-upstream
$ git branch -u origin/main
$ git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main ]]

   If you make sure that you don't have pending things on your side, an easier way is to delete your local copy and clone the repositories.


To rename the branch in the repository on Github.com, you go into the settings of your repo, select "Branches", and you'll find the way to rename the branch there. See also
   https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fgithub%2Frenaming&amp;data=04%7C01%7Caarongu%40microsoft.com%7C7ff995c552024aea94d708d8c79a557e%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637478813095920024%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=%2BHBdmuSPWIMXlvS51pkznRusx25jWUiuzK6e6cVfe1M%3D&amp;reserved=0

Make sure things work as expected afterwards, including the github.io URLs (GH may not regenerate properly)

If you need assistance, please ask on the IRC channel #git,

Thank you,

Philippe

with many thanks Dom, Denis, and Atsushi ]]

Received on Tuesday, 2 February 2021 19:28:33 UTC