From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.groups.io with SMTP id smtpd.web12.935.1579290261888018494 for ; Fri, 17 Jan 2020 11:44:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=utVR5vU4; spf=pass (domain: linaro.org, ip: 209.85.128.68, mailfrom: leif.lindholm@linaro.org) Received: by mail-wm1-f68.google.com with SMTP id p9so8570011wmc.2 for ; Fri, 17 Jan 2020 11:44:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=3fHj1QxgNeqAUMI4WEVP0VUXqTa6DVnOuv8wO1lIhpo=; b=utVR5vU4jgaVvxJbAtUsjcUOCRjwGToO2L7ocpDlW6+P9V+8ZE01oj0mx/s8qxlun4 D9a9gPR2JCgDKv/DoKcg/4tbdNm2rUUUNH3mazTrzW0f7r6aug2O/9bq47vVObO0KM4n x2blDJgv/QE1fNwIwb3WKC16/XEyaf6OwG99bqcJPwewIw/YXA64oXvsDTdVho3nsMMP BRyfx0q2eJIMojOl8HtNwDPqyrtE3sCOpf+BCK1RNh2LG4kqffGHHLSuJr+iu6i8s5Oc Gv94c54SyrAhmYSZLXM7bHXD15iBDB8FB7hX9LJNPhqlNLRNDhJ/svyMhJcD136VofK1 MXPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=3fHj1QxgNeqAUMI4WEVP0VUXqTa6DVnOuv8wO1lIhpo=; b=q/DTxbgE+JcF/xhLdYBvDp25/s0uI/hJGsg2wGrl/Hm9sGazxFYin9CW0i/LkCBXZY RIZKvGfKLo/gqbKGLwTRgzO8EbJlVYLjm1sLoXgstDA+tcdl+DUZaUdKJGFP6OFQIDv8 sWIkYKFQDMB4sQliiDncJ+TAKLiYx2Nz65Kp5vo5C7kAVg0df8/yXR5+htyVRf8uglca SBrQBD+hxZpIaryNXjGcEvI1Z6UXr1TQ53xsq8Ds14+4kFsQwpqVSbDr/TB5OXSR2AVA W5yF9l7NjweZ7JcooZz11EqcjSytyH/BQn9w5XfrQoIPmMm/vY0umNAZ39OdTXueHdi0 5Pnw== X-Gm-Message-State: APjAAAX8K+Jk1p9MzC9xP6OgMtAVRCIOPksEUL1hnaTBvjgPRtAs1pde CbvXBqfDu0zDa6j89QDYsrAaCA== X-Google-Smtp-Source: APXvYqyqcOehZV34IslfWWZdknbKlP4caSDr3y6LGY4tdiXCR7dfit4MtfNg8wFVIfPRBlo1jBSopg== X-Received: by 2002:a05:600c:230d:: with SMTP id 13mr6484879wmo.13.1579290260364; Fri, 17 Jan 2020 11:44:20 -0800 (PST) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id 18sm3751610wmf.1.2020.01.17.11.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2020 11:44:19 -0800 (PST) Date: Fri, 17 Jan 2020 19:44:18 +0000 From: Leif Lindholm To: 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 Message-ID: <20200117194418.GN20629@bivouac.eciton.net> References: <20191111084107.5368-1-michael.d.kinney@intel.com> <20191111084107.5368-22-michael.d.kinney@intel.com> MIME-Version: 1.0 In-Reply-To: <20191111084107.5368-22-michael.d.kinney@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > Cc: Sean Brogan > Cc: Bret Barkelew > Signed-off-by: Michael D Kinney > Reviewed-by: Liming Gao > --- > .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.
> +# 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 > > > >