[llvm-dev] [cfe-dev] Renaming The Default Branch

Hubert Tong via llvm-dev llvm-dev at lists.llvm.org
Mon Dec 7 16:38:01 PST 2020


On Mon, Dec 7, 2020 at 10:59 AM Mike Edwards via cfe-dev <
cfe-dev at lists.llvm.org> wrote:

> Hi,
> Currently there are two issues I would like to address:
>
> 1) While we understand new commits to the 'main' branch are somewhat slow
> to synchronize (about 5 minutes) to the old 'master' branch, we are not
> planning to address the issue at this time.  Developers will notice an
> immediate improvement by migrating their workflows to the new 'main'
> branch.  We advise everyone to stop relying on 'master' and migrate to the
> 'main' branch as soon as possible.
>
When will it be correct to push to `main` for all of the repos under the
GitHub org?


>
> 2) As Hans just pointed out, the automation we have in place to make
> commits post to the mailing lists is not working correctly.  I will be
> looking into this today and hope to have it resolved soon.
>
> -Mike
>
> On Mon, Dec 7, 2020 at 6:35 AM Hans Wennborg <hans at chromium.org> wrote:
>
>> Nice!
>>
>> One issue that I noticed is that it seems all commit emails now go to
>> the llvm-branch-commits mailing list. For example,
>>
>> http://lists.llvm.org/pipermail/llvm-branch-commits/2020-December/015623.html
>> was pushed to 'main', but still went to this list which is supposed to
>> be for commits to release branches and such.
>>
>> Is there some way that can be fixed?
>>
>> Thanks,
>> Hans
>>
>> On Mon, Dec 7, 2020 at 7:38 AM Mike Edwards via llvm-dev
>> <llvm-dev at lists.llvm.org> wrote:
>> >
>> > Hello,
>> > The change to the default branch setting has been completed.  The new
>> default branch for the llvm-project is now 'main'.  Pushes to the 'master'
>> branch will no longer be accepted.  Please update your workflow to use the
>> new 'main' branch.  Thank you for your patience and cooperation during this
>> process.  I hope everyone has a nice, productive day.
>> >
>> > Respectfully,
>> >
>> > Mike Edwards
>> > On Behalf Of the LLVM Foundation
>> >
>> > On Sun, Dec 6, 2020 at 9:54 PM Mike Edwards <mike at sqlby.me> wrote:
>> >>
>> >> Hello,
>> >> This is a reminder the process to rename the default branch to main
>> will begin in approximately 10 minutes.  An update will be sent to the
>> lists once the process has been completed and the branch is open to receive
>> new commits.
>> >>
>> >> Thanks,
>> >> Mike Edwards
>> >>
>> >> On Fri, Nov 13, 2020 at 3:56 PM Mike Edwards <mike at sqlby.me> wrote:
>> >>>
>> >>> Hi Everyone,
>> >>> Many tech communities, including GitHub and Git, have moved away from
>> term “master branch” and replaced it with “main branch” in an
>> >>> effort to remove unnecessary references to slavery and use more
>> inclusive terms.  This was also discussed on the LLVM-dev mailing list
>> >>> and there was strong consensus from LLVM Developers’ that the LLVM
>> Project should also rename our master branch as well. Now that
>> >>> an industry standard name has been selected by GitHub, the LLVM
>> Project can begin the renaming process of the default branch to “main”.
>> >>>
>> >>> This change will occur at **06:00GMT on Monday December 7, 2020**
>> (time is **GMT**, please adjust for your local timezone).
>> >>>
>> >>> To make this as easy as possible we plan to do the following prior to
>> November 20, 2020:
>> >>> * Create a new branch named 'test-main' on the llvm-project repository
>> >>>     * This branch will be read-only except for the llvmbot account
>> >>>     * Setup a GitHub action to mirror commits from 'master' to
>> ‘test-main' automatically
>> >>>     * Allow the configuration to soak for a few days to ensure
>> everything works
>> >>> * Create a new branch named “main” on the llvm-project repository
>> >>>     * This branch will be readonly initially
>> >>>     * Reuse the previous Github Action to mirror master to main
>> >>>     * This configuration will stay in place until cutover takes place
>> on Dec. 7
>> >>>
>> >>> On December 7, 2020:
>> >>> * We will lock the master branch and change it to be readonly (with
>> the exception of llvmbot)
>> >>> * Switch the GitHub action to mirror commits from the new main branch
>> back to the old master branch
>> >>> * Make a few test commits to ensure the GitHub action is functioning
>> as expected
>> >>> * Open the main branch to commits from community members
>> >>> * In parallel we will begin to work through the rest of the llvm
>> organization repositories to update branch names as well
>> >>> * We will update the developer policy to reflect the change in
>> workflow
>> >>>
>> >>> On January 7, 2021:
>> >>> * We will remove the ‘master’ branch from all repositories in the
>> llvm organization
>> >>>
>> >>> As we work towards December 7, 2020 we are going to set up a test of
>> this system on a fork of the llvm-project
>> >>> in order to simulate the cutover. If we encounter any issues we will
>> update the community on llvm-dev.
>> >>> We expect the llvm-project repository to be unavailable to developers
>> for approximately 1 hour while the
>> >>> switch is made. Lockout will occur promptly at 06:00GMT on the 7th.
>> Certainly if we finish sooner, we will
>> >>> update llvm-dev to let everyone know the repository is available for
>> use once again.
>> >>>
>> >>> We know this has been a long process and we want to thank everyone
>> for their patience.  We look forward to getting
>> >>> the project completed soon.
>> >>>
>> >>> Respectfully,
>> >>>
>> >>> Mike Edwards
>> >>> On Behalf Of the LLVM Foundation
>> >
>> > _______________________________________________
>> > LLVM Developers mailing list
>> > llvm-dev at lists.llvm.org
>> > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>
> _______________________________________________
> cfe-dev mailing list
> cfe-dev at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20201207/23a96d71/attachment.html>


More information about the llvm-dev mailing list