From nobody Tue Feb 10 09:57:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+82706+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+82706+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1635264132; cv=none; d=zohomail.com; s=zohoarc; b=ZWf0gGZ413qynWibbeTFR/SUzR86TVxnRpAeiZn9piJLJfJaTOuqeDu8ZaDu+drUF9Vyk5oBydMr8vOBpLOGbrB1rNAuAn4fbjxPZ7dS/IjEPYZTfxDIJz2NP4vrD61pEQrIeGF8CFISTythImQFghxtp5XyfkWg9bIaTC3z5h8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635264132; h=Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=LBx5OJK7SEh6rMWXNhSyvrLdifJkuBWVzv9vqu2Off8=; b=l0YT7UVJ10HKMEUflS+r/R2fvxkrjZf9iBnONAlxRHPgSsn8vyx3ekFuUcr2ALLMrHxG/8/kjh4vEzOF3FVBUkz9mf68xPhLFAEpRGhRT6xPOlTYIfwviotwYxyu/QpDPUd7T4RNsgOd0mi91gWiE4D+MyyT6JXLRYIHoXklLyk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+82706+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635264132064968.5764790050237; Tue, 26 Oct 2021 09:02:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id BSuiYY1788612xYzsdBHjPol; Tue, 26 Oct 2021 09:02:11 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.14399.1635264130657551346 for ; Tue, 26 Oct 2021 09:02:11 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5DBCF1396; Tue, 26 Oct 2021 09:02:10 -0700 (PDT) X-Received: from e120189.arm.com (unknown [10.57.74.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7FDC13F70D; Tue, 26 Oct 2021 09:02:08 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Ard Biesheuvel , Leif Lindholm , Sean Brogan , Bret Barkelew , Michael D Kinney , Liming Gao , Sami Mujawar Subject: [edk2-devel] [PATCH edk2-platforms v4 5/6] .mergify: Add Mergify YML pull request rules configuration file Date: Tue, 26 Oct 2021 17:01:40 +0100 Message-Id: <20211026160141.17400-6-Pierre.Gondois@arm.com> In-Reply-To: <20211026160141.17400-1-Pierre.Gondois@arm.com> References: <20211026160141.17400-1-Pierre.Gondois@arm.com> Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,pierre.gondois@arm.com X-Gm-Message-State: GJ4U8WMt7rwkAnWf9NZWBCi2x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635264131; bh=ZT5FXzu38xOAx3xz0h/2tKkFynqQHxPa1nUSEu1Y/L0=; h=Date:From:Reply-To:Subject:To; b=cQNUcTGNgIGWuVzWoLH65cs76re2qTIwyKJHs5RV9WvSrvgUVv13z3eYLblIDrV/c/M NS0HweqjpewOkW+77s2QstLAtSvu4anZyAQyk4JMaMUirGteU2JFwHB4nCnOIIJRuiOIO I0Rksj7lq7rTbKjbumFEaJVoNhi6fUVFn4w= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635264142443100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois 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=3D3509 Change-Id: I73b00fc289f60880fa06bcb8f1ac61a2bf8793d1 Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sean Brogan Cc: Bret Barkelew Cc: Michael D Kinney Cc: Liming Gao Cc: Sami Mujawar Signed-off-by: Pierre Gondois --- Notes: v3: - Align with the latest version in the edk2 repository. [Michael] .mergify/config.yml | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .mergify/config.yml diff --git a/.mergify/config.yml b/.mergify/config.yml new file mode 100644 index 000000000000..bd6da4c77937 --- /dev/null +++ b/.mergify/config.yml @@ -0,0 +1,50 @@ +## @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 - 2021, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# https://github.com/apps/mergify +# https://doc.mergify.io/ +# +## + +queue_rules: + - name: default + conditions: + - base~=3D(^main|^master|^stable/) + - label=3Dpush + +pull_request_rules: + - name: Automatically merge a PR when all required checks pass and 'push= ' label is present + conditions: + - base~=3D(^main|^master|^stable/) + - label=3Dpush + actions: + queue: + method: rebase + rebase_fallback: none + name: default + + - name: Post a comment on a PR that can not be merged due to a merge con= flict + conditions: + - base~=3D(^main|^master|^stable/) + - conflict + actions: + comment: + message: PR can not be merged due to conflict. Please rebase and = resubmit --=20 2.17.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 (#82706): https://edk2.groups.io/g/devel/message/82706 Mute This Topic: https://groups.io/mt/86606571/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-