From nobody Mon Feb 9 09:52:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49605+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49605+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572378931; cv=none; d=zoho.com; s=zohoarc; b=NU/f5qoJYcsRH0RSHAkXeIZURlWf032rq/0QXAWmteotIAP16f/DESX0AhrPVm3vl1Rxkd//1rpg2HppnC9ZSN/zz6ATr2VCoTjmQQtuWj8tM5JxCwcWRFtmz8raDJ3R3kwx/k+I1kpNym1Cr9Hi2zSNt75Iplyk91n9AunlHCc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572378931; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=asLukpnL+PrxqgCkVMDnHFRdGVgt98AbDSLurtBQraM=; b=dU81QKrC94BrG/Gwsk5zv4a5wnp7RvUv3+ApTSpdZUI6COQd2rNAwrsj54Q86jMNJlkDNz5zXiKAwjuu5KNF9vNPVCrvm3iRdICjaH5F7VkMezrcDB8p1kIfvHb69uK7C5Nj0LMjAhqDVbesGrfIKdu+DOctWH82LzgLdfsl6S8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49605+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572378931228230.46845357577956; Tue, 29 Oct 2019 12:55:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 99JhYY1788612xHHPvf3iGpW; Tue, 29 Oct 2019 12:55:30 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.707.1572378927372028712 for ; Tue, 29 Oct 2019 12:55:29 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Oct 2019 12:55:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,245,1569308400"; d="scan'208";a="211170269" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.251.0.39]) by fmsmga001.fm.intel.com with ESMTP; 29 Oct 2019 12:55:29 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Sean Brogan , Bret Barkelew Subject: [edk2-devel] [Patch v3 21/22] .merify: Add Megify YML pull request rules configuration file Date: Tue, 29 Oct 2019 12:55:16 -0700 Message-Id: <20191029195517.20028-22-michael.d.kinney@intel.com> In-Reply-To: <20191029195517.20028-1-michael.d.kinney@intel.com> References: <20191029195517.20028-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: AClrJD2Sun2vH5aJ2kMp0Dmtx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572378930; bh=vAdOkOzRQcYD/aFjkgibEfX881uv9qb7PwcncVqv8lo=; h=Cc:Date:From:Reply-To:Subject:To; b=FvydAGed6jYZPZbuYEc6FpAQ7xIr6DKrHie0z16gQF+Pza990iEycxvPhZMYfYQHDLG DKjZWzRjS+ay34RbThnNTEAJclt/7Z4MdK71GUpiUDQCf/38e7DkojjEGJEuujA2zbm4O +PoHFk8S9t+MjAhkO3bG74/CIpy8F9oZL/A= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D2315 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 --- .mergify/config.yml | 71 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .mergify/config.yml diff --git a/.mergify/config.yml b/.mergify/config.yml new file mode 100644 index 0000000000..86674ce366 --- /dev/null +++ b/.mergify/config.yml @@ -0,0 +1,71 @@ +## @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=3Dedk2-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: automatic merge when GitHub branch protection passes and 'push' = label is present + conditions: + - base=3Dmaster + - label=3Dpush + - author=3D@tianocore/edk-ii-maintainers + - status-success=3Dtianocore.PatchCheck + - status-success=3DUbuntu GCC5 PR + - status-success=3DWindows VS2019 PR + actions: + merge: + strict: true + method: rebase + - name: automatic close when GitHub branch protection passes and 'push' = label is not present + conditions: + - base=3Dmaster + - label!=3Dpush + - status-success=3Dtianocore.PatchCheck + - status-success=3DUbuntu GCC5 PR + - status-success=3DWindows VS2019 PR + 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 con= flict + conditions: + - base=3Dmaster + - 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 membe= rship check and 'push' label is present + conditions: + - base=3Dmaster + - label=3Dpush + - -author=3D@tianocore/edk-ii-maintainers + actions: + close: + message: PR submitter is not a member of the Tianocore EDK II Main= tainers team + - name: post a comment on a PR that does not pass PatchCheck.py checks + conditions: + - base=3Dmaster + - status-failure=3Dtianocore.PatchCheck + actions: + comment: + message: PR can not be merged due to PatchCheck errors. Please re= solve and resubmit --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49605): https://edk2.groups.io/g/devel/message/49605 Mute This Topic: https://groups.io/mt/39614223/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-