From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242])
 by mx.groups.io with SMTP id smtpd.web08.33075.1608513584957973818
 for <devel@edk2.groups.io>;
 Sun, 20 Dec 2020 17:19:46 -0800
Authentication-Results: mx.groups.io;
 dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn)
Received: from DESKTOPS6D0PVI ([58.246.60.130])
	(envelope-sender <gaoliming@byosoft.com.cn>)
	by 192.168.6.13 with ESMTP
	for <bret.barkelew@microsoft.com>; Mon, 21 Dec 2020 09:19:42 +0800
X-WM-Sender: gaoliming@byosoft.com.cn
X-WM-AuthFlag: YES
X-WM-AuthUser: gaoliming@byosoft.com.cn
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: <devel@edk2.groups.io>,
	<michael.d.kinney@intel.com>
Cc: "'Sean Brogan'" <sean.brogan@microsoft.com>,
	"'Bret Barkelew'" <Bret.Barkelew@microsoft.com>
References: <20201219024715.2000-1-michael.d.kinney@intel.com>
In-Reply-To: <20201219024715.2000-1-michael.d.kinney@intel.com>
Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BhdGNoIDEvMV0gLm1lcmdpZnk6IEVuYWJsZSBNZXJnaWZ5IGZvciBzdGFibGUvKiBicmFuY2hlcw==?=
Date: Mon, 21 Dec 2020 09:19:39 +0800
Message-ID: <012901d6d737$5c9e0000$15da0000$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQHx5XDugvoWxJ+Hbo4c/zAzh7srzanKo8ew
Content-Type: text/plain;
	charset="gb2312"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> =B7=A2=BC=FE=C8=CB: bounce+27952+69247+4905953+8761045@groups.io
> <bounce+27952+69247+4905953+8761045@groups.io> =B4=FA=B1=ED Michael D
> Kinney
> =B7=A2=CB=CD=CA=B1=BC=E4: 2020=C4=EA12=D4=C219=C8=D5 10:47
> =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io
> =B3=AD=CB=CD: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew
> <Bret.Barkelew@microsoft.com>; Liming Gao <gaoliming@byosoft.com.cn>
> =D6=F7=CC=E2: [edk2-devel] [Patch 1/1] .mergify: Enable Mergify for stab=
le/*
> branches
>=20
> https://bugzilla.tianocore.org/show_bug.cgi?id=3D3130
>=20
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .mergify/config.yml | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>=20
> diff --git a/.mergify/config.yml b/.mergify/config.yml
> index 26583de0f631..9774aaf49774 100644
> --- a/.mergify/config.yml
> +++ b/.mergify/config.yml
> @@ -16,7 +16,7 @@
>  # * 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>
> +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR=
>
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  # https://github.com/apps/mergify
> @@ -28,7 +28,7 @@ pull_request_rules:
>=20
>    - name: Automatically merge a PR when all required checks pass and
> 'push' label is present
>      conditions:
> -      - base=3Dmaster
> +      - base~=3D(^master|^stable/)
>        - label=3Dpush
>        - author=3D@tianocore/edk-ii-maintainers
>        - status-success=3Dtianocore.PatchCheck
> @@ -41,7 +41,7 @@ pull_request_rules:
>=20
>    - name: Automatically close a PR when all required checks pass and
'push'
> label is not present
>      conditions:
> -      - base=3Dmaster
> +      - base~=3D(^master|^stable/)
>        - -label=3Dpush
>        - -closed
>        - status-success=3Dtianocore.PatchCheck
> @@ -55,7 +55,7 @@ pull_request_rules:
>=20
>    - name: Post a comment on a PR that can not be merged due to a merge
> conflict
>      conditions:
> -      - base=3Dmaster
> +      - base~=3D(^master|^stable/)
>        - conflict
>      actions:
>        comment:
> @@ -63,7 +63,7 @@ pull_request_rules:
>=20
>    - name: Automatically close a PR that fails the EDK II Maintainers
> membership check and 'push' label is present
>      conditions:
> -      - base=3Dmaster
> +      - base~=3D(^master|^stable/)
>        - label=3Dpush
>        - -author=3D@tianocore/edk-ii-maintainers
>      actions:
> @@ -72,7 +72,7 @@ pull_request_rules:
>=20
>    - name: Post a comment on a PR if PatchCheck fails
>      conditions:
> -      - base=3Dmaster
> +      - base~=3D(^master|^stable/)
>        - status-failure=3Dtianocore.PatchCheck
>      actions:
>        comment:
> @@ -80,7 +80,7 @@ pull_request_rules:
>=20
>    - name: Post a comment on a PR if Ubuntu GCC5 fails
>      conditions:
> -      - base=3Dmaster
> +      - base~=3D(^master|^stable/)
>        - status-failure=3DUbuntu GCC5 PR
>        - status-success=3DUbuntu GCC5 PR (FAILED)
>      actions:
> @@ -89,7 +89,7 @@ pull_request_rules:
>=20
>    - name: Post a comment on a PR if Windows VS2019 fails
>      conditions:
> -      - base=3Dmaster
> +      - base~=3D(^master|^stable/)
>        - status-failure=3DWindows VS2019 PR
>        - status-success=3DWindows VS2019 PR (FAILED)
>      actions:
> --
> 2.29.2.windows.2
>=20
>=20
>=20
>=20
>=20