From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"pierre.gondois@arm.com" <pierre.gondois@arm.com>,
Sean Brogan <sean.brogan@microsoft.com>,
"Bret Barkelew" <Bret.Barkelew@microsoft.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
Sami Mujawar <sami.mujawar@arm.com>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Subject: Re: [edk2-devel] [PATCH edk2-platforms v2 5/6] .mergify: Add Mergify YML pull request rules configuration file
Date: Wed, 28 Jul 2021 20:25:45 +0000 [thread overview]
Message-ID: <CO1PR11MB4929BED0F7879EE9863FD189D2EA9@CO1PR11MB4929.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20210727165004.9470-6-Pierre.Gondois@arm.com>
The Mergify rules in edk2 repo were recently updated.
Please align with the latest that uses the new Mergify queue feature
along with other improvements.
Thanks,
Mike
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of PierreGondois
> Sent: Tuesday, July 27, 2021 9:50 AM
> To: devel@edk2.groups.io; Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Kinney,
> Michael D <michael.d.kinney@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Sami Mujawar <sami.mujawar@arm.com>
> Subject: [edk2-devel] [PATCH edk2-platforms v2 5/6] .mergify: Add Mergify YML pull request rules configuration file
>
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> These files are copies of the files from the tianocore/edk2
> repository. Any modification to the tianocore/edk2 files must be
> reflected on the tianocore/edk2-platforms copies.
>
> Initial commid-id in the edk2 repository: ab060128768b
> Initial message:
>
> 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.
>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3509
>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> .mergify/config.yml | 98 +++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 98 insertions(+)
> create mode 100644 .mergify/config.yml
>
> diff --git a/.mergify/config.yml b/.mergify/config.yml
> new file mode 100644
> index 000000000000..ee27a4152a75
> --- /dev/null
> +++ b/.mergify/config.yml
> @@ -0,0 +1,98 @@
> +## @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) 2021, Arm Ltd. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020, 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|^stable/)
> + - 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|^stable/)
> + - -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|^stable/)
> + - 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|^stable/)
> + - 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|^stable/)
> + - 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|^stable/)
> + - 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|^stable/)
> + - 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.17.1
>
>
>
>
>
next prev parent reply other threads:[~2021-07-28 20:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 16:49 [PATCH edk2-platforms v2 0/6] Enable edk2-platforms CI for JunoPkg PierreGondois
2021-07-27 16:49 ` [PATCH edk2-platforms v2 1/6] edk2-platforms: add edk2 repository as a submodule PierreGondois
2021-07-27 16:50 ` [PATCH edk2-platforms v2 2/6] pip-requirements.txt: Add python pip requirements file PierreGondois
2021-07-27 16:50 ` [PATCH edk2-platforms v2 3/6] .pytool/Plugin: Add CI plugins PierreGondois
2021-07-27 16:50 ` [PATCH edk2-platforms v2 4/6] .azurepipelines: Add Azure Pipelines YML configuration files PierreGondois
2021-07-27 16:50 ` [PATCH edk2-platforms v2 5/6] .mergify: Add Mergify YML pull request rules configuration file PierreGondois
2021-07-28 20:25 ` Michael D Kinney [this message]
2021-07-27 16:50 ` [PATCH edk2-platforms v2 6/6] Platform/ARM: Juno: Add JunoPkg.ci.yaml for CI support PierreGondois
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CO1PR11MB4929BED0F7879EE9863FD189D2EA9@CO1PR11MB4929.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox