Re: [edk2-devel] [Patch v5 21/22] .mergify: Add Mergify YML pull request rules configuration file

[Leif Lindholm <leif.lindholm@linaro.org>]

Hi Mike,

Many thanks for resolving!
I'll try your other suggestions if this happens again in future.

Best Regards,

Leif

On Fri, Jan 17, 2020 at 20:22:03 +0000, Kinney, Michael D wrote:
> Hi Leif,
> 
> I have not tried the mergify commands like that.  I can investigate
> further if we think we need them.
> 
> I saw that some of the Azure pipelines checks did not run.  That
> Is what was blocking Mergify.  Mergify was waiting for status.
> 
> I did a Close and Re-open to re-trigger Azure Pipelines and that
> worked.  You changed have been committed.
> 
> We have seen a very rare condition in communication between 
> Azure Pipelines and GitHub.  This close/re-open is what we
> can try first.  The 2nd approach is to abandon the current
> PR and create a new PR with the same content.  That has only
> had to be used once since enabling in early November.
> 
> Mike
> 
> > -----Original Message-----
> > From: Leif Lindholm <leif.lindholm@linaro.org>
> > Sent: Friday, January 17, 2020 11:44 AM
> > To: Kinney, Michael D <michael.d.kinney@intel.com>
> > Cc: devel@edk2.groups.io
> > Subject: Re: [edk2-devel] [Patch v5 21/22] .mergify:
> > Add Mergify YML pull request rules configuration file
> > 
> > Hi Mike (on-list),
> > 
> > Embarassing to admit, but I hadn't tried to do my first
> > mergify commit
> > until the Maintainers.txt right now, and that isn't
> > working as I expected.
> > 
> > I tried to force a retry on
> > https://github.com/tianocore/edk2/pull/307
> > (since I added the 'push' tag *after* submitting the
> > github pull
> > request), but as you can see mergify says
> > "@leiflindholm is not allowed
> > to run commands".
> > 
> > Am I missing something obvious?
> > 
> > Best Regards,
> > 
> > Leif
> > 
> > On Mon, Nov 11, 2019 at 00:41:06 -0800, Michael D
> > Kinney wrote:
> > > Add directory for the Mergify YML configuration files
> > that
> > > provides rules and actions used to process a pull
> > request.
> > >
> > > * Auto commit a PR from EDK II Maintainer with 'push'
> > label
> > >   set and all CI checks pass
> > > * Auto close a PR from any developers without 'push'
> > label
> > >   set and all CI checks pass.
> > > * Auto close a PR from a non EDK II Maintainer that
> > has
> > >   the 'push' label set.
> > > * Post a comment to a PR that has a merge conflict.
> > >   Submitter can resolved conflicts and reopen the PR.
> > > * Post a comment to a PR that fails PatchCheck.py
> > >   Submitter can resolve PatchCheck.py issues and
> > >   reopen the PR.
> > >
> > > Cc: Liming Gao <liming.gao@intel.com>
> > > Cc: Sean Brogan <sean.brogan@microsoft.com>
> > > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> > > Signed-off-by: Michael D Kinney
> > <michael.d.kinney@intel.com>
> > > Reviewed-by: Liming Gao <liming.gao@intel.com>
> > > ---
> > >  .mergify/config.yml | 97
> > +++++++++++++++++++++++++++++++++++++++++++++
> > >  1 file changed, 97 insertions(+)
> > >  create mode 100644 .mergify/config.yml
> > >
> > > diff --git a/.mergify/config.yml
> > b/.mergify/config.yml
> > > new file mode 100644
> > > index 0000000000..26583de0f6
> > > --- /dev/null
> > > +++ b/.mergify/config.yml
> > > @@ -0,0 +1,97 @@
> > > +## @file
> > > +# Mergify YML file that automatically merges a
> > GitHub pull request against
> > > +# edk2-ci if all of the GitHub branch protections
> > have passed.  It also
> > > +# contains rules to:
> > > +# * auto close branches that are not from an EDK II
> > Maintainer
> > > +# * post a comment on pull requests that have merge
> > conflicts.
> > > +# * post a comment on pull requests that have
> > PatchCheck.py errors.
> > > +#
> > > +# Configuration Notes:
> > > +# * Update the 'base=edk2-ci' statements with the
> > name of the branch to merge
> > > +#   pull requests.
> > > +#
> > > +# * Update the 'status-failure' statement with the
> > name of the name of the Azure
> > > +#   Pipelines Build that performs the EDK II
> > Maintainer check.
> > > +#
> > > +# * This file must be checked into the 'default'
> > branch of a repo.  Copies
> > > +#   of this file on other branches of a repo are
> > ignored by Mergify.
> > > +#
> > > +# Copyright (c) 2019, Intel Corporation. All rights
> > reserved.<BR>
> > > +# SPDX-License-Identifier: BSD-2-Clause-Patent
> > > +#
> > > +# https://github.com/apps/mergify
> > > +# https://doc.mergify.io/
> > > +#
> > > +##
> > > +
> > > +pull_request_rules:
> > > +
> > > +  - name: Automatically merge a PR when all required
> > checks pass and 'push' label is present
> > > +    conditions:
> > > +      - base=master
> > > +      - label=push
> > > +      - author=@tianocore/edk-ii-maintainers
> > > +      - status-success=tianocore.PatchCheck
> > > +      - status-success=Ubuntu GCC5 PR
> > > +      - status-success=Windows VS2019 PR
> > > +    actions:
> > > +      merge:
> > > +        strict: true
> > > +        method: rebase
> > > +
> > > +  - name: Automatically close a PR when all required
> > checks pass and 'push' label is not present
> > > +    conditions:
> > > +      - base=master
> > > +      - -label=push
> > > +      - -closed
> > > +      - status-success=tianocore.PatchCheck
> > > +      - status-success=Ubuntu GCC5 PR
> > > +      - status-success=Windows VS2019 PR
> > > +      - status-success=Ubuntu GCC5 PR (FINISHED)
> > > +      - status-success=Windows VS2019 PR (FINISHED)
> > > +    actions:
> > > +      close:
> > > +        message: All checks passed. Auto close
> > personal build.
> > > +
> > > +  - name: Post a comment on a PR that can not be
> > merged due to a merge conflict
> > > +    conditions:
> > > +      - base=master
> > > +      - conflict
> > > +    actions:
> > > +      comment:
> > > +        message: PR can not be merged due to
> > conflict.  Please rebase and resubmit
> > > +
> > > +  - name: Automatically close a PR that fails the
> > EDK II Maintainers membership check and 'push' label is
> > present
> > > +    conditions:
> > > +      - base=master
> > > +      - label=push
> > > +      - -author=@tianocore/edk-ii-maintainers
> > > +    actions:
> > > +      close:
> > > +        message: PR submitter is not a member of the
> > Tianocore EDK II Maintainers team
> > > +
> > > +  - name: Post a comment on a PR if PatchCheck fails
> > > +    conditions:
> > > +      - base=master
> > > +      - status-failure=tianocore.PatchCheck
> > > +    actions:
> > > +      comment:
> > > +        message: PR can not be merged due to a
> > PatchCheck failure.  Please resolve and resubmit
> > > +
> > > +  - name: Post a comment on a PR if Ubuntu GCC5
> > fails
> > > +    conditions:
> > > +      - base=master
> > > +      - status-failure=Ubuntu GCC5 PR
> > > +      - status-success=Ubuntu GCC5 PR (FAILED)
> > > +    actions:
> > > +      comment:
> > > +        message: PR can not be merged due to an
> > Ubuntu GCC5 failure.  Please resolve and resubmit
> > > +
> > > +  - name: Post a comment on a PR if Windows VS2019
> > fails
> > > +    conditions:
> > > +      - base=master
> > > +      - status-failure=Windows VS2019 PR
> > > +      - status-success=Windows VS2019 PR (FAILED)
> > > +    actions:
> > > +      comment:
> > > +        message: PR can not be merged due to a
> > Windows VS2019 failure.  Please resolve and resubmit
> > > --
> > > 2.21.0.windows.1
> > >
> > >
> > > 
> > >