From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (NAM04-MW2-obe.outbound.protection.outlook.com [40.107.101.122]) by mx.groups.io with SMTP id smtpd.web09.7524.1625716519772920261 for ; Wed, 07 Jul 2021 20:55:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@microsoft.com header.s=selector2 header.b=QFGmE2zs; spf=pass (domain: microsoft.com, ip: 40.107.101.122, mailfrom: bret.barkelew@microsoft.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EFAWW5hRJ3z4RUKa1rhq7vAEIzP925d4SUR8H0PBEcHCRu4RT3H+TSEapBG1DXY9Dc5czIFDP9KZLW8gJgnrR0xSAS5LDhho6rgxALD7RCzca9uw8noKZJOXYSQ9T+E+4neZRccxBExwmx6JhntKNXHcogD6NgJEhXS4Ew7VmB9p1qRXVANkE0qJu7yRlnpe7A9CI0eCCgTObaqpjMfO/oW/tWdkcG0f9LkEctrZH30GUXPpVTod/fUmIe1gms+jxAKZ2hwB2QZuQB4m5uDSl1E7qNbfHemyGWRgQok1OUwHQ7gefg/IhWffKC8B2nwUTC7jNU1/+8kfdrPIuGvL9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cYzs1yR81Nsv7lNpyOBGwCRU3OU+/u8dARoMETYxeIs=; b=jTvv/oEztJmRK2OsPxdyuezHFw2JAFGTagtg63YiUEIgvU8UMPsd0GfSCYhvpcu69SHYPGzGEqR+ndqDdT0PtEREmpTNiQ+MX+HrTOzW7BMnIQFqur3vhjnM455WHeA0u77LAxKw8ZJMUmdCI+sa3dQoDzM//tLBDjcmJly5ZoypX9cES0PjZqWOjc/9fZ4D5XTo/zZUI+S+fYpasE3m00rKe9EQj7kEG8AmHWV1FcG6WDNvpEnV17pkh6kl1/AXz/6K8yUr994HhsEm4t9c3ulw/zA+//bQay7SmlCEzMA9yoWeLqfJ2JXkbgEYt+9Xt24RFfHvdk2YAlqlfDYnCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cYzs1yR81Nsv7lNpyOBGwCRU3OU+/u8dARoMETYxeIs=; b=QFGmE2zscH1FDWOO+g2WbrxG9rWznGBbgdAXW2Jf13Io4yjK7z15a/5kETPrs2c+CJDuvqwVhK4kZ6xTp6jWElPE2sWjtdAsIVh4NE8o0VyRY0QoP+G6DdZ41gMHV1Rh1bbX+bJbCwwixTsIeq3b0nnWa0W3mOBBWE+3DXYUezw= Received: from MW4PR21MB1907.namprd21.prod.outlook.com (2603:10b6:303:71::8) by MWHPR21MB0190.namprd21.prod.outlook.com (2603:10b6:300:79::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.7; Thu, 8 Jul 2021 03:55:16 +0000 Received: from MW4PR21MB1907.namprd21.prod.outlook.com ([fe80::dff:779b:e14b:8086]) by MW4PR21MB1907.namprd21.prod.outlook.com ([fe80::dff:779b:e14b:8086%3]) with mapi id 15.20.4331.010; Thu, 8 Jul 2021 03:55:16 +0000 From: "Bret Barkelew" To: "devel@edk2.groups.io" , "Kinney, Michael D" CC: "Feng, Bob C" , Liming Gao , "Chen, Yuwei" Subject: Re: [EXTERNAL] [edk2-devel] [Patch 1/3] BaseTools/Scripts: Ignore Mergify merge commits in PatchCheck.py Thread-Topic: [EXTERNAL] [edk2-devel] [Patch 1/3] BaseTools/Scripts: Ignore Mergify merge commits in PatchCheck.py Thread-Index: AQHXc6w+P6jWpUUCRUm9GpQ/AfbjBqs4csKQ Date: Thu, 8 Jul 2021 03:55:16 +0000 Message-ID: References: <20210708034902.1608-1-michael.d.kinney@intel.com>,<20210708034902.1608-2-michael.d.kinney@intel.com> In-Reply-To: <20210708034902.1608-2-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=True;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2021-07-08T03:55:12.5267576Z;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a0be7b5c-fb25-41f2-d9ab-08d941c43293 x-ms-traffictypediagnostic: MWHPR21MB0190: x-ld-processed: 72f988bf-86f1-41af-91ab-2d7cd011db47,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:785; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 2vbUDhtMPAdbE18jreWcRJ6PNX73A1yWqZtB1LbnRx8MG3fDtMPQrVNZnWq1QVZ+gBs5Dd54q4fgx8Lj9m12KzENJH/uz92B3Cn4rlLvzy2da2QyeMlVs5CMrvAVjKgZnZ7d0RdrahrgNUmEkRfOJm6Jo9fWGiZHA2uFUlqyNegR7lJECyIvdatUOxw3iYvBguZNcDDZHRzU/iz+Zj0vJBRRlNtqpUYnkBAMUgdfs16qevcnHyVfR5dWaOYLILL7j+syv36eHj68QbyPD2oZyIgGc6WqXHe9wsWmoNdvXrI89vTzvpClq9q+9IqDE5f5O6dYK66NyfxwwYdXzSrcQHeBZitBDxM+cLYOwd3EovgPbi1hFH1PM7uFINsSQ2mj+J4PemdV8BPa/pVPOcirMsYbwtKfNszDMGCsTRSVRUxrDLiTUxCKS+XQWTGpLSz903Y9T0D5mgzZkBOs4VbxikDW2gBqjTPmpm7tbXchd6m3AVN8dLqxzs3VjXjLy0x3CE4Yjp1nU+9Xx+FFIF5A9TzI5C0AWmK/sdVxG7rEwrwH/vBQus2yQKk1wuGk7kZKk+9MogEaMP07VHPUZnjBsPbwl7aOai5ERCvY7K6EULhgOBpgRUcjlJ2sn7AUvcmRaSzYltuPGbvqE5BAtp2js+L2R6/eMAtq8x2HMd16j7x64tXVVY/2xneAw+uzDahY9JNyvzWqhPYAbNsCDZC+Glz+7z24NoklTppnsvAZS54= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR21MB1907.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66446008)(166002)(83380400001)(71200400001)(66476007)(66946007)(86362001)(122000001)(7696005)(55016002)(66556008)(54906003)(2906002)(4326008)(5660300002)(8990500004)(82950400001)(76116006)(966005)(82960400001)(8936002)(8676002)(64756008)(10290500003)(478600001)(110136005)(33656002)(186003)(38100700002)(9686003)(6506007)(316002)(53546011)(26005)(52536014);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?K0k36eBSEer7QYO9BEcdbSVY4bjZR8xMg7ptDjIF/3f/kdZdoqWrKFm4YaK9?= =?us-ascii?Q?PhYSOmiHBkVafdgMz6H6Ivam7PN096kfjnd8N5cGiVTzg7RZbRfmVBuZvkIV?= =?us-ascii?Q?kTEyEPy+rnTxKlqerl7OQXhFRkYMrNf2mwwX+KujfPlFKz1VDBbk7iXs4uSK?= =?us-ascii?Q?+SwVxlGmG8tWwhkZvG6JQ2lp+IYAHQIE+CYNQqQ+7xf2Q+qdI8oXV6wXjfIB?= =?us-ascii?Q?7I/qgEiHL6oQzV/HG6nJH3CtpHin9x1LH3SeLJO6NoZ5nvest2+dZ28kq/ES?= =?us-ascii?Q?mIvoXSaKN9aAijAq92CCx9t6pbQSLXuk55U46oWbhspMnMIQ7pGDBWtyYwS1?= =?us-ascii?Q?kCPv466W3i4cu8L3/v1tKHe36yyCLTzPEOmAONRu39hmwF8vrGKLXDTiamd7?= =?us-ascii?Q?CgsFqPYhE9yCCvx8dXhb5zZNLQpx7tUDHw84rLmHeb3Yc0mKB5K+DsaKO6Gy?= =?us-ascii?Q?WiUgH922TwXUXB2SjylinOcF19WvGC9rtokrg5sdn4whpI0ZmYw9RfG7oVjA?= =?us-ascii?Q?JgnFSJJ+X4JPD/NQSjsgRrqiWXt9hIucoeTIF0WC62mrioDPrnfm0becTmeo?= =?us-ascii?Q?Cjx8C4/bs22nMGga5EsLrnASf3jaM4QsfXBIYiGjBIlzEYL7K0ZACofKmhdi?= =?us-ascii?Q?WVteW9Kac/UKL7mgd4xbhuxYj+Ye7DpPJlGskF/t6mym9ifaambFLWE50YWz?= =?us-ascii?Q?9IQhwq3h36wZGejlSKB15LFuRdGhfkpCtWz0NCCWSfPgmO3sBWMbWt9Rygfq?= =?us-ascii?Q?dJfSJsJzJip5vG2ltun6D/LRc6sTn399JIubO8TwEZkSaAVpPzKW4eWD/Eiw?= =?us-ascii?Q?0KzOHKfqzucw89aadSW1IItfJ0/mLidD06zaSZ2/C4a+/2x+I7Sqw32LmC9h?= =?us-ascii?Q?B+w97U2p0LCydXqQTSMDoLgiUfKbzmE2ACDRHeTzyaM0hwk38ROMvkzktP0W?= =?us-ascii?Q?j5V8Hu9ypXmt+MiwLn7X4n4m4HXjCIxcuOWWV/KFSuZCqY2THOmfF920aO/H?= =?us-ascii?Q?ocbvMaUigS74eLCxbQRBBsDt8g4arKlYNoMUOPdn+beUlqudHH9OumE/YZQa?= =?us-ascii?Q?UUgMaxhG1Ms87d2LbA1BA39YwvrfMqZOOaLS4wXQakvAivrMar9QAKPRj4DK?= =?us-ascii?Q?kH+Z2NYBnTSl9oAlvyo9/xy2duzv3wPrlBqgz+HUTkEHxUzaDA0bmhdMSJ2O?= =?us-ascii?Q?NiyUHzYalxyy0Ix+FQoFHQoKMS9+VzUTaAZwRGpGughCC5jgI7c2NBbARMLt?= =?us-ascii?Q?jVlODpLXn1u4aDmrXtWI0sOwfceGFZqzmcBW45LyCx5ciLpMj0/tzx7um+UW?= =?us-ascii?Q?wvsnpLpLXDfEY1nPydhdSVIx/hYBUOyWDOSjlGDKW5ZToA=3D=3D?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR21MB1907.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0be7b5c-fb25-41f2-d9ab-08d941c43293 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2021 03:55:16.6068 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ky94lFZ9z0l3eEE1277koHLyfiDz/6Oc3vGxfXRWeFgAvQJToA3KN5STQrIgIlYb2uSE9fbAOR+cUXNNg3FaRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR21MB0190 Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_MW4PR21MB1907E6C8AAFF3D0E5AA29B95EF199MW4PR21MB1907namp_" --_000_MW4PR21MB1907E6C8AAFF3D0E5AA29B95EF199MW4PR21MB1907namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bret Barkelew - Bret ________________________________ From: devel@edk2.groups.io on behalf of Michael D K= inney via groups.io Sent: Wednesday, July 7, 2021 8:49:00 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao ; Chen, Yuwei Subject: [EXTERNAL] [edk2-devel] [Patch 1/3] BaseTools/Scripts: Ignore Mer= gify merge commits in PatchCheck.py Mergify adds merge commits to a PR when processing PRs using the queue feature with auto rebase. Update PatchCheck.py to ignore commit message issues with these merge commits. These merge commits are not added to the base branch when the PR is merged by Mergify. Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Signed-off-by: Michael D Kinney --- BaseTools/Scripts/PatchCheck.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchChec= k.py index 80754e763c5a..63e6223f8ebc 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -1,7 +1,7 @@ ## @file # Check a patch for various format issues # -# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.
# Copyright (C) 2020, Red Hat, Inc.
# Copyright (c) 2020, ARM Ltd. All rights reserved.
# @@ -89,22 +89,28 @@ class EmailAddressCheck: class CommitMessageCheck: """Checks the contents of a git commit message.""" - def __init__(self, subject, message): + def __init__(self, subject, message, author_email): self.ok =3D True if subject is None and message is None: self.error('Commit message is missing!') return + MergifyMerge =3D False + if "mergify[bot]@users.noreply.github.com" in author_email: + if "Merge branch" in subject: + MergifyMerge =3D True + self.subject =3D subject self.msg =3D message print (subject) self.check_contributed_under() - self.check_signed_off_by() - self.check_misc_signatures() - self.check_overall_format() + if not MergifyMerge: + self.check_signed_off_by() + self.check_misc_signatures() + self.check_overall_format() self.report_message_result() url =3D 'https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%= 3A%2F%2Fgithub.com%2Ftianocore%2Ftianocore.github.io%2Fwiki%2FCommit-Messag= e-Format&data=3D04%7C01%7CBret.Barkelew%40microsoft.com%7C44bf20b900a84= 63872f608d941c36036%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C6376131296= 59549071%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTi= I6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3DScoSoLs0hgaj7DOtCjE1uevYTX2oAHO= qJOHKJYZQ%2BGw%3D&reserved=3D0' @@ -522,7 +528,7 @@ class CheckOnePatch: email_check =3D EmailAddressCheck(self.author_email, 'Author') email_ok =3D email_check.ok - msg_check =3D CommitMessageCheck(self.commit_subject, self.commit= _msg) + msg_check =3D CommitMessageCheck(self.commit_subject, self.commit= _msg, self.author_email) msg_ok =3D msg_check.ok diff_ok =3D True -- 2.32.0.windows.1 --_000_MW4PR21MB1907E6C8AAFF3D0E5AA29B95EF199MW4PR21MB1907namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Reviewed-by: Bret Barkelew <bret.barkelew@micros= oft.com>

 

- Bret

 

From: devel@edk2.groups.io= <devel@edk2.groups.io> on behalf of Michael D Kinney via groups.io &= lt;michael.d.kinney=3Dintel.com@groups.io>
Sent: Wednesday, July 7, 2021 8:49:00 PM
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaolim= ing@byosoft.com.cn>; Chen, Yuwei <yuwei.chen@intel.com>
Subject: [EXTERNAL] [edk2-devel] [Patch 1/3] BaseTools/Scripts: Ign= ore Mergify merge commits in PatchCheck.py
 
Mergify adds merge commits to a PR when processin= g PRs using
the queue feature with auto rebase.  Update PatchCheck.py
to ignore commit message issues with these merge commits.
These merge commits are not added to the base branch when
the PR is merged by Mergify.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 BaseTools/Scripts/PatchCheck.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchChec= k.py
index 80754e763c5a..63e6223f8ebc 100755
--- a/BaseTools/Scripts/PatchCheck.py
+++ b/BaseTools/Scripts/PatchCheck.py
@@ -1,7 +1,7 @@
 ## @file
 #  Check a patch for various format issues
 #
-#  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved= .<BR>
+#  Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved= .<BR>
 #  Copyright (C) 2020, Red Hat, Inc.<BR>
 #  Copyright (c) 2020, ARM Ltd. All rights reserved.<BR><= br>  #
@@ -89,22 +89,28 @@ class EmailAddressCheck:
 class CommitMessageCheck:
     """Checks the contents of a git co= mmit message."""
 
-    def __init__(self, subject, message):
+    def __init__(self, subject, message, author_email):          self.ok =3D True
 
         if subject is None and&nb= sp; message is None:
             s= elf.error('Commit message is missing!')
             r= eturn
 
+        MergifyMerge =3D False
+        if "mergify[bot]@users.no= reply.github.com" in author_email:
+            if &qu= ot;Merge branch" in subject:
+            &= nbsp;   MergifyMerge =3D True
+
         self.subject =3D subject<= br>          self.msg =3D message
 
         print (subject)
 
         self.check_contributed_un= der()
-        self.check_signed_off_by()
-        self.check_misc_signatures() -        self.check_overall_format() +        if not MergifyMerge:
+            self.c= heck_signed_off_by()
+            self.c= heck_misc_signatures()
+            self.c= heck_overall_format()
         self.report_message_resul= t()
 
     url =3D 'https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2F= github.com%2Ftianocore%2Ftianocore.github.io%2Fwiki%2FCommit-Message-Format= &amp;data=3D04%7C01%7CBret.Barkelew%40microsoft.com%7C44bf20b900a846387= 2f608d941c36036%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C63761312965954= 9071%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik= 1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=3DScoSoLs0hgaj7DOtCjE1uevYTX2oAHO= qJOHKJYZQ%2BGw%3D&amp;reserved=3D0'
@@ -522,7 +528,7 @@ class CheckOnePatch:
         email_check =3D EmailAddr= essCheck(self.author_email, 'Author')
         email_ok =3D email_check.= ok
 
-        msg_check =3D CommitMessageChe= ck(self.commit_subject, self.commit_msg)
+        msg_check =3D CommitMessageChe= ck(self.commit_subject, self.commit_msg, self.author_email)
         msg_ok =3D msg_check.ok  
         diff_ok =3D True
--
2.32.0.windows.1






--_000_MW4PR21MB1907E6C8AAFF3D0E5AA29B95EF199MW4PR21MB1907namp_--