From: "Bret Barkelew" <bret.barkelew@microsoft.com>
To: "Kinney, Michael D" <michael.d.kinney@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: Liming Gao <gaoliming@byosoft.com.cn>,
Sean Brogan <sean.brogan@microsoft.com>
Subject: Re: [EXTERNAL] [Patch 2/3] .mergify: Simplify Mergify rules using GitHub status checks
Date: Thu, 8 Jul 2021 03:55:35 +0000 [thread overview]
Message-ID: <MW4PR21MB190761088AB399E010745881EF199@MW4PR21MB1907.namprd21.prod.outlook.com> (raw)
In-Reply-To: <20210708034902.1608-3-michael.d.kinney@intel.com>
[-- Attachment #1: Type: text/plain, Size: 5137 bytes --]
Acked-by: Bret Barkelew <bret.barkelew@microsoft.com>
- Bret
From: Michael D Kinney<mailto:michael.d.kinney@intel.com>
Sent: Wednesday, July 7, 2021 8:49 PM
To: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
Cc: Liming Gao<mailto:gaoliming@byosoft.com.cn>; Sean Brogan<mailto:sean.brogan@microsoft.com>; Bret Barkelew<mailto:Bret.Barkelew@microsoft.com>
Subject: [EXTERNAL] [Patch 2/3] .mergify: Simplify Mergify rules using GitHub status checks
* Enable Mergify queue feature to support auto rebase when
'push' label is set and gauarntee that all EDK II CI checks
are run before merging in changes with linear history.
* Use status checks configured in GitHub branch protections
* Allow non EDK II Maintainers to create a PR
Requires an EDK II Maintainer to accept the change and
request merge by adding 'push' label. Only EDK II Maintainers
have ability to set/clear labels.
* Do not automatically close PRs for personal builds.
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.mergify/config.yml | 71 ++++++++-------------------------------------
1 file changed, 12 insertions(+), 59 deletions(-)
diff --git a/.mergify/config.yml b/.mergify/config.yml
index 9774aaf49774..bd6da4c77937 100644
--- a/.mergify/config.yml
+++ b/.mergify/config.yml
@@ -16,7 +16,7 @@
# * 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 - 2020, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fapps%2Fmergify&data=04%7C01%7CBret.Barkelew%40microsoft.com%7Cb73475b4d67744f2e3ce08d941c35a00%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637613129552748468%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=bWUUW1qS2GsSqRMBiZELIj4qlLBe06nkALTz0hkLrLo%3D&reserved=0
@@ -24,74 +24,27 @@
#
##
+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~=(^master|^stable/)
+ - base~=(^main|^master|^stable/)
- label=push
- - author=@tianocore/edk-ii-maintainers
- - status-success=tianocore.PatchCheck
- - status-success=Ubuntu GCC5 PR
- - status-success=Windows VS2019 PR
actions:
- merge:
- strict: true
+ queue:
method: rebase
-
- - name: Automatically close a PR when all required checks pass and 'push' label is not present
- conditions:
- - base~=(^master|^stable/)
- - -label=push
- - -closed
- - status-success=tianocore.PatchCheck
- - status-success=Ubuntu GCC5 PR
- - status-success=Windows VS2019 PR
- - status-success=Ubuntu GCC5 PR (FINISHED)
- - status-success=Windows VS2019 PR (FINISHED)
- actions:
- close:
- message: All checks passed. Auto close personal build.
+ rebase_fallback: none
+ name: default
- name: Post a comment on a PR that can not be merged due to a merge conflict
conditions:
- - base~=(^master|^stable/)
+ - base~=(^main|^master|^stable/)
- 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 membership check and 'push' label is present
- conditions:
- - base~=(^master|^stable/)
- - label=push
- - -author=@tianocore/edk-ii-maintainers
- actions:
- close:
- message: PR submitter is not a member of the Tianocore EDK II Maintainers team
-
- - name: Post a comment on a PR if PatchCheck fails
- conditions:
- - base~=(^master|^stable/)
- - status-failure=tianocore.PatchCheck
- actions:
- comment:
- message: PR can not be merged due to a PatchCheck failure. Please resolve and resubmit
-
- - name: Post a comment on a PR if Ubuntu GCC5 fails
- conditions:
- - base~=(^master|^stable/)
- - status-failure=Ubuntu GCC5 PR
- - status-success=Ubuntu GCC5 PR (FAILED)
- actions:
- comment:
- message: PR can not be merged due to an Ubuntu GCC5 failure. Please resolve and resubmit
-
- - name: Post a comment on a PR if Windows VS2019 fails
- conditions:
- - base~=(^master|^stable/)
- - status-failure=Windows VS2019 PR
- - status-success=Windows VS2019 PR (FAILED)
- actions:
- comment:
- message: PR can not be merged due to a Windows VS2019 failure. Please resolve and resubmit
--
2.32.0.windows.1
[-- Attachment #2: Type: text/html, Size: 9709 bytes --]
next prev parent reply other threads:[~2021-07-08 3:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 3:48 [Patch 0/3] Mergify Enhancements Michael D Kinney
2021-07-08 3:49 ` [Patch 1/3] BaseTools/Scripts: Ignore Mergify merge commits in PatchCheck.py Michael D Kinney
2021-07-08 3:55 ` [EXTERNAL] [edk2-devel] " Bret Barkelew
2021-07-09 5:30 ` Bob Feng
2021-07-08 3:49 ` [Patch 2/3] .mergify: Simplify Mergify rules using GitHub status checks Michael D Kinney
2021-07-08 3:55 ` Bret Barkelew [this message]
2021-07-08 3:49 ` [Patch 3/3] .azurepipelines: Remove FINISHED and FAILED states Michael D Kinney
2021-07-08 3:51 ` [EXTERNAL] " Bret Barkelew
2021-07-09 5:09 ` 回复: [edk2-devel] [Patch 0/3] Mergify Enhancements gaoliming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MW4PR21MB190761088AB399E010745881EF199@MW4PR21MB1907.namprd21.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox