From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) 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) 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: [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> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026160141.17400-1-Pierre.Gondois@arm.com> References: <20211026160141.17400-1-Pierre.Gondois@arm.com> 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=3509 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=edk2-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~=(^main|^master|^stable/) + - label=push + +pull_request_rules: + - name: Automatically merge a PR when all required checks pass and 'push' label is present + conditions: + - base~=(^main|^master|^stable/) + - label=push + 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 conflict + conditions: + - base~=(^main|^master|^stable/) + - conflict + actions: + comment: + message: PR can not be merged due to conflict. Please rebase and resubmit -- 2.17.1