W3C home > Mailing lists > Public > public-webapps@w3.org > January to March 2021

Fwd: Renaming the master branches

From: Léonie Watson <lwatson@tetralogical.com>
Date: Tue, 2 Feb 2021 16:45:45 +0000
To: public-webapps@w3.org
Message-ID: <b503c013-b563-d999-92c7-740b0949494b@tetralogical.com>
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://w3c.github.io/validate-repos/report.html?grouptype=workinggroup&filter=defaultbranchismaster
(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://lists.w3.org/Archives/Public/public-immersive-web-wg/2021Jan/0004.html

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://github.com/w3c/ttml2/search?q=master

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

 
https://docs.github.com/en/github/administering-a-repository/renaming-a-branch#updating-a-local-clone-after-a-branch-name-changes

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://github.com/github/renaming

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 16:46:02 UTC

This archive was generated by hypermail 2.4.0 : Tuesday, 2 February 2021 16:46:03 UTC