Master branch will be removed from all non-3p repositories in the next few months

116 views
Skip to first unread message

Josip Sokcevic

unread,
Aug 31, 2021, 8:45:11 PM8/31/21
to mainbranch...@chromium.org

tl;dr The Chops Source team will remove the master branch from all non-3p repositories in the next few months. We will first break synchronization between main and master and temporarily delete the master branch starting next week. Please ensure you no longer rely on the master branch being up-to-date or present.

Hi all,

We are entering the last phase of the migration! The goal is to have a smooth transition with little to no disruptions. We will be removing synchronization between main and master, and we will temporarily delete the master branch. If we notice something breaks and can't be quickly patched, we will restore the deleted branch to allow more time for the fix. All bugs and issues should be reported here.

Please ensure you no longer rely on the master branch (in your local development setup, in tools you maintain, etc).

You can migrate your local git repository by executing the following in your git work directory:

git migrate-default-branch

The command is part of depot_tools.

The schedule is as follows:

  • week of 2021-09-06

    • Remove the sync from all non-3p repositories that didn't have update in the past 2 years

    • Remove the sync from all infra repositories, and delete the master branch. Should critical bugs be found, we will restore the branch and sync sooner; and repeat the process until we have no issues

  • week of 2021-09-20

    • Remove the sync from all non-3p repositories that didn't have update in the past 1 year

    • Remove the sync from chromium/src, and delete the master branch for 4h. Should critical bugs be found, we will restore the branch and sync sooner.

  • week of 2021-09-27

    • Remove the master branch from 100 non-3p repositories that didn't have updates in the past 2 years.

    • Remove the sync from v8/v8, chromium/src and delete the master branch for 24h.


We will publish the rest of the timeline in late September and adjust if necessary.


Should you have questions you can contact us by submitting a bug here or at mainbranch...@chromium.org. 

Josip on behalf of the ChOps Source team.

Josip Sokcevic

unread,
Sep 20, 2021, 7:04:12 PM9/20/21
to mainbranch...@chromium.org
Hi all,

We successfully completed everything we planned for week 2021-09-06. We are moving forward with removing the sync of all non-3p repositories that didn't have updates in the past 1 year. We are also removing the sync for chromium/src tomorrow (2021-09-21) at 2pm Pacific. If everything goes well, the master branch will be removed on Thursday (2021-09-23) at 9:30am Pacific. The branch will be restored 4 hours later, at 1:30pm.

Best,
--
Josip Sokcevic

Josip Sokcevic

unread,
Sep 23, 2021, 12:54:33 PM9/23/21
to mainbranch...@chromium.org
Hi all,

We've removed the sync for chromium/src on Tuesday. However, we will be postponing deletion of the master branch for now. We may periodically sync main and master in case we see issues, or even fully restore the sync temporarily. We will communicate when the master branch will be removed.

As for the rest of the repositories, we are moving forward with removing the sync from all non-3p repositories with no commits in the past year.

Best,
--
Josip Sokcevic

Josip Sokcevic

unread,
Nov 9, 2021, 6:18:00 PM11/9/21
to mainbranch...@chromium.org
Hi all,

We've removed the sync from all repositories. Let us know if you encounter any issues, either by replying here or filing a bug.

We will temporarily remove the master branch of chromium/src on Thursday, November 11th at 10am Pacific. The branch will be restored at 2pm, or sooner if needed.

Best,
--
Josip Sokcevic
Reply all
Reply to author
Forward
0 new messages