llvm dev - Mar 2019 - [cfe-dev] [lldb-dev] [GitHub] RFC: Enforcing no merge commit policy

On 03/20/2019 10:41 AM, Zachary Turner wrote:
> 
> 
> On Tue, Mar 19, 2019 at 12:00 PM Tom Stellard via lldb-dev <lldb-dev at
lists.llvm.org <mailto:lldb-dev at lists.llvm.org>> wrote:
> 
>     Hi,
> 
>     I would like to follow up on the previous thread[1], where there was a
consensus
>     to disallow merge commits in the llvm github repository, and start a
discussion
>     about how we should enforce this policy.
> 
>     Unfortunately, GitHub does not provide a convenient way to fully
enforce this policy.
> 
>  
> Why isn't this enforceable with a server-side pre-receive hook?
GitHub[1] only supports pre-receive hooks in the 'Enterprise Server'
plan, which is for self-hosted github instances.

-Tom

[1] https://github.com/pricing

On Wed, Mar 20, 2019 at 2:19 PM Tom Stellard via cfe-dev <
cfe-dev at lists.llvm.org> wrote:
> On 03/20/2019 10:41 AM, Zachary Turner wrote:
> >
> > On Tue, Mar 19, 2019 at 12:00 PM Tom Stellard via lldb-dev <
> lldb-dev at lists.llvm.org <mailto:lldb-dev at lists.llvm.org>>
wrote:
> >
> >     Hi,
> >
> >     I would like to follow up on the previous thread[1], where there
was
> a consensus
> >     to disallow merge commits in the llvm github repository, and start
a
> discussion
> >     about how we should enforce this policy.
> >
> >     Unfortunately, GitHub does not provide a convenient way to fully
> enforce this policy.
> >
> >
> > Why isn't this enforceable with a server-side pre-receive hook?
>
> GitHub[1] only supports pre-receive hooks in the 'Enterprise
Server'
> plan, which is for self-hosted github instances.
>
AIUI, the GitHub team is perfectly willing to help out the LLVM project in
whatever way LLVM needs, including but not limited to turning on
server-side hooks for us.
https://twitter.com/natfriedman/status/1086470665832607746

Server-side hooks are *the *answer to this problem. There is no problem.
You just use a server-side hook.

(Whether or not to use GitHub PRs is an orthogonal question. You can use
hooks with PRs, or hooks without PRs; PRs with hooks, or PRs without hooks.)

–Arthur
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20190320/a6b96dc3/attachment.html>

It sounds like we need to get someone from the Foundation (chandlerc@,
lattner@, tanya@, someone else?) to reach out to them offline about this.

On Wed, Mar 20, 2019 at 11:23 AM Arthur O'Dwyer <arthur.j.odwyer at
gmail.com>
wrote:
> On Wed, Mar 20, 2019 at 2:19 PM Tom Stellard via cfe-dev <
> cfe-dev at lists.llvm.org> wrote:
>
>> On 03/20/2019 10:41 AM, Zachary Turner wrote:
>> >
>> > On Tue, Mar 19, 2019 at 12:00 PM Tom Stellard via lldb-dev <
>> lldb-dev at lists.llvm.org <mailto:lldb-dev at
lists.llvm.org>> wrote:
>> >
>> >     Hi,
>> >
>> >     I would like to follow up on the previous thread[1], where
there
>> was a consensus
>> >     to disallow merge commits in the llvm github repository, and
start
>> a discussion
>> >     about how we should enforce this policy.
>> >
>> >     Unfortunately, GitHub does not provide a convenient way to
fully
>> enforce this policy.
>> >
>> >
>> > Why isn't this enforceable with a server-side pre-receive
hook?
>>
>> GitHub[1] only supports pre-receive hooks in the 'Enterprise
Server'
>> plan, which is for self-hosted github instances.
>>
>
> AIUI, the GitHub team is perfectly willing to help out the LLVM project in
> whatever way LLVM needs, including but not limited to turning on
> server-side hooks for us.
> https://twitter.com/natfriedman/status/1086470665832607746
>
> Server-side hooks are *the *answer to this problem. There is no problem.
> You just use a server-side hook.
>
> (Whether or not to use GitHub PRs is an orthogonal question. You can use
> hooks with PRs, or hooks without PRs; PRs with hooks, or PRs without
hooks.)
>
> –Arthur
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20190320/932502cd/attachment.html>

On 20 Mar 2019, at 18:23, Arthur O'Dwyer via cfe-dev <cfe-dev at
lists.llvm.org> wrote:
> 
> Server-side hooks are the answer to this problem. There is no problem. You
just use a server-side hook.
It is quite unlikely that GitHub will allow LLVM (or any other project) to run
arbitrary post-receive hooks.  It is far more likely that they will give an
option that disables the merge button in PRs.  It is already possible to prevent
direct pushes to master by anyone, so this would be a very small change
(literally disabling one button in the UI).

David