From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web09.7217.1625808639249799625 for ; Thu, 08 Jul 2021 22:30:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=m+dhszSB; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: bob.c.feng@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10039"; a="206637976" X-IronPort-AV: E=Sophos;i="5.84,226,1620716400"; d="scan'208";a="206637976" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2021 22:30:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,226,1620716400"; d="scan'208";a="424228135" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga007.fm.intel.com with ESMTP; 08 Jul 2021 22:30:38 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Thu, 8 Jul 2021 22:30:37 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Thu, 8 Jul 2021 22:30:37 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.106) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.4; Thu, 8 Jul 2021 22:30:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sqd33FoFPCw9qv4EVTgWcRZRQnMB9I78gp8CHZz/Miei/P45XJHiANPni9gt/8ic2SlAMFL38Q+/pHFyk4AK/w4Ve9AVhc4wZzW76pJ23usE4ZfsSWH3rVY/poDaaCvsOlZrzZwWSlZIof8u+0YqXI/4Vi9NtWbJsxW21Wj1x0IEIxNfcEViDmqDvA8Qzaz1pLEGXDlfgODR59BELV0W3VHqg9Wqc/5jsGpQTgGkb+rQ3uVp0SjNQ+EyYNHewDvkr77W2CLUIZLPsyqGVe8yL0c5Q8y9IZEcR04MdmQoqCZsxfQ/XqeTSaLelwOwy5iuxprHBD5n1fsvD4rIjU7jDg== 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=4pV4jgRVO5RtqKGuOc88Wqfa+l+gb3L69kUK00Pta88=; b=We2WwbuR1COi09YUI5G2O13gxM7se0/cFM3okfEQ72wcBbmmq0z0RLPYkNWVqy1PPpCoIm6z6dZxTlVAYiADI/IMSGBmuzOOd392vv/UKF8Vggayxt2jMy6ZSTc4nUisFrqBby4GIb3dn+p3YHgBe7n1j1YtjADatyT77d1wX9E2bDEc1/2xYeFTatvQ+H/bLkkfldPJFRHiEQxduma3KgxOfMovj26p6Be28MKjbEarD4jvR0xtbRaNI5lU/rBa28QUqMslvEBhcMjzQMc5b44XKjcTq0OM0LWTV99XuvRD+NyOxdMPASFsyCdvrix74T2uY98MPAtaJ+xn8WuJCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4pV4jgRVO5RtqKGuOc88Wqfa+l+gb3L69kUK00Pta88=; b=m+dhszSBFk7LouKJHAVlcYF1CNT7ItGmTu8uca9rSLo+PI3bBGstjwA9exbiCD/Nr9biobgmqGYnYL97vGWNDsCfwwwsk3K9UKKW5HZl90gqJ80nqWDcDoIaBb4+eRCezwAQUYzWqS3CWXj3ed50JArne3WI69d2p1TYNXqUhmc= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM4PR11MB5293.namprd11.prod.outlook.com (2603:10b6:5:390::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20; Fri, 9 Jul 2021 05:30:35 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::b9b5:523d:7195:4f6c]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::b9b5:523d:7195:4f6c%3]) with mapi id 15.20.4287.035; Fri, 9 Jul 2021 05:30:35 +0000 From: "Bob Feng" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: Liming Gao , "Chen, Christine" Subject: Re: [Patch 1/3] BaseTools/Scripts: Ignore Mergify merge commits in PatchCheck.py Thread-Topic: [Patch 1/3] BaseTools/Scripts: Ignore Mergify merge commits in PatchCheck.py Thread-Index: AQHXc6w56Tm72URYhke0yL7kW+WgT6s6H6YA Date: Fri, 9 Jul 2021 05:30:35 +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: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 13a43e20-17b9-4464-327d-08d9429aad81 x-ms-traffictypediagnostic: DM4PR11MB5293: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:262; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: HZYdUD0A5iWBQiWfU/6CW0x+quT80HQp4XsT1QWZQ/e1E+/6CivOe60KoDfASLsANCqnv9z5Oj4oR5+W0xRCiEjBmr0SUYW8U2UPBo4UQ4zO6ZbCLiempiiHJQktmIEkeLZ/cqhvD7xMObkQkOodt27sWFk4iB+PagfO6BSwqprpwHqbA/tRjPSAVWSgeDxr9obRT7846NwyV7hj3c+nq8OrOY4iz0aw2KKjN0FQW9k8enDnc/NqI9cdsMqRqLnswH6hbVYtzXFmjmFnbwJqtmyuG7lxcPhv9OdFqpWOidGPjG4JrjPC34gRiux2BPbz8HDwI3fHW7jTXoNkV4dzQec52aNN5kzkq4cpi8kIMgeUBi9NbT3cBvmHbUD/Cv6NFN0skcFuuBg4yDVW2md64dMq1yh9WKZjelmwCWVQYmvUKIwPhysLuPYVB6he/BdzvHjhP1z3AN+HwmKydF21znBZk/QhrkzY6hEPBtrwx3sjcRd1cGPzvaDNQWO/2y0HkZHZFdt5G5NkpWDHwSU61BUNPtxXjYil0suMFEZluaEHD0rcXTFHlp4qnzvjt/hmQ58OCOjBkfJWtn92cSgb9BVc+OUEDnIu2dj5hn1iFcC10E4xh27Y3Kr1nTpmAp2fEXdLwViYkTYfmO4NXyatvqZkQCpzFzd++sQXrt7Fa7iOnw6wqVCtgW9W7iGjlfmrcR5C5dtejEN5KtX6bw0AKqBQCBMiIK+qDpRJ/jLDxiM= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(366004)(376002)(346002)(136003)(396003)(26005)(5660300002)(54906003)(9686003)(186003)(52536014)(66556008)(64756008)(66476007)(33656002)(8936002)(110136005)(53546011)(4326008)(2906002)(478600001)(86362001)(71200400001)(107886003)(76116006)(8676002)(38100700002)(122000001)(66946007)(55016002)(83380400001)(7696005)(66446008)(316002)(6506007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?jvcvUIbEjC/uxSYIn/f5I0Nj1EJc299TD5CGtXeeF8zJvK1qxxTRMInOLqXj?= =?us-ascii?Q?vp6qw0g7Cq40j1126nrB8MzANOCrJUU9WM5AsEcG+surDsq9711qYGl/q5/j?= =?us-ascii?Q?9mEsF30hTpdhK8zaLVXkIKu8tnErR+scECLA+3F6ol8vSsm2PlOTMOxhZ7T7?= =?us-ascii?Q?A5bmrGay924bPgJyHbWGgIzaD53ibGhKc0XjfxS7hQ8kdbe9hn6ePtoOip5t?= =?us-ascii?Q?fxZGo1nKHE/cKAHPHU7e3e4t/5mXXRpwo1prfTgrZNmr2eNgrrIyq+Cf6TcQ?= =?us-ascii?Q?4W536QCwkS9Kf7QUw1dHGTzCKM91GwYo9/82bjKfLsmqkIHqGkJlDC0xcbSe?= =?us-ascii?Q?dt2nMYspErTit9cgVndzLWP5UDJF9edI9QmbZfeIs/KRM9WHj7TERK0v10hb?= =?us-ascii?Q?hV1nZRX/i72XEch3UR39S6eiCtVk6lyNZF8E9IbjGF1PGUIIdM88k/qt++7x?= =?us-ascii?Q?77VdxhkiOU06LHJNNk4DyOU/UXo03o29NP1eTEmwyi8RXHIxYaO31LpqQo01?= =?us-ascii?Q?P5dYLC62rX2JLGIkAMkpfmbhucFddh5NF/ZUb1x0/yiHZdGp89osbDoI1D22?= =?us-ascii?Q?4t17YdKCS2DwPjU9QmpivkpM4vXvJI3TzzAX3Bf5jG9FddnGKnmtDVbYuOCw?= =?us-ascii?Q?nr9RtwwnQP/Wb6IDMd6R+I5LsR9DaE1MKAvjihgdu3gkmLKbltNLFMkH2d6m?= =?us-ascii?Q?YNEnb1Eem5ItGuJ3YhTRN5EJEmzieLJTb4Z+gzJloQMGK0zA3vx6xhCTgVt9?= =?us-ascii?Q?QcAxI9RNOY/hiKWHMuY9ccfL6w1fcghkSv2VFvaWccOtS4wLJy7giS6D5UBM?= =?us-ascii?Q?nx95kyyvcCgA+EH2Nu+II9ZwHxioOvBKhCePqVJl5hXYPPK9E3PkeIu0yJBF?= =?us-ascii?Q?x6KYezrV2xwxh1Y5T/XlVhE+CdF1vbyG9w/A4sFpepClXNlVtDX6aDdFgnNk?= =?us-ascii?Q?W/gTAcC+IfLafvvpw8rhZM2hoXYnxZhIYJdERhm0ngjEv0rw2SDPnkxTdj3m?= =?us-ascii?Q?Lha4fYnO8W/lmTtovVFcDyuBytH4RorO3njfQr2vS9ZTkfn9d5IakZQvZPw8?= =?us-ascii?Q?PTQXx5z5gjCijJCTgpMvreUQgwGiq+MOCKQc2AtqcpCTGerXJzKG5/j9n19B?= =?us-ascii?Q?DA1xXx6UXavgOQwHskSFLIvJeWI3XcJWJwN47zo0Xupqr2Ep0KuJVRbXKP5c?= =?us-ascii?Q?9ZlkXf6VdCdn1H2PjMy0sWCV6ZyzTRMZ/T4LzK36wMRtbrxDSfw+EGAD2xej?= =?us-ascii?Q?J3AofTndCvxGyrVtV15mO3z/c+Xlk6tq4FHYVZJ7r7y1SR2ttnPJv+qGlJgN?= =?us-ascii?Q?Q48=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13a43e20-17b9-4464-327d-08d9429aad81 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jul 2021 05:30:35.1638 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Ef/Ytad3gAsDohOZ7qCegqm58YmoxIEX6E+Dj8pIb5kHEFBMjhUM7TbDFQNpaVb7FysPw/l/zoVqd3ehhU2AIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5293 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Kinney, Michael D =20 Sent: Thursday, July 8, 2021 11:49 AM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao ; Chen, Christine Subject: [Patch 1/3] BaseTools/Scripts: Ignore Mergify merge commits in Pat= chCheck.py Mergify adds merge commits to a PR when processing PRs using the queue feat= ure 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/PatchCheck= .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 - 202= 0, Intel Corporation. All rights reserved.
+# Copyright (c) 2015 - 2021, Intel Corporation. All rights=20 +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.""" =20 - def __init__(self, subject, message): + def __init__(self, subject, message, author_email): self.ok =3D True =20 if subject is None and message is None: self.error('Commit message is missing!') return =20 + 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 =20 print (subject) =20 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() =20 url =3D 'https://github.com/tianocore/tianocore.github.io/wiki/Commit-= Message-Format' @@ -522,7 +528,7 @@ class CheckOnePatch: email_check =3D EmailAddressCheck(self.author_email, 'Author') email_ok =3D email_check.ok =20 - msg_check =3D CommitMessageCheck(self.commit_subject, self.commit_= msg) + msg_check =3D CommitMessageCheck(self.commit_subject,=20 + self.commit_msg, self.author_email) msg_ok =3D msg_check.ok =20 diff_ok =3D True -- 2.32.0.windows.1