<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="EN-US" link="blue" vlink="#954F72" style="word-wrap:break-word"> <div class="WordSection1"> Acked-by: Bret Barkelew <bret.barkelew@microsoft.com> <o:p> </o:p> - Bret<o:p></o:p> <o:p> </o:p> <div style="mso-element:para-border-div;border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> From: <a href="mailto:michael.d.kinney@intel.com">Michael D Kinney</a> Sent: Wednesday, July 7, 2021 8:49 PM To: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> Cc: <a href="mailto:gaoliming@byosoft.com.cn">Liming Gao</a>; <a href="mailto:sean.brogan@microsoft.com"> Sean Brogan</a>; <a href="mailto:Bret.Barkelew@microsoft.com">Bret Barkelew</a> Subject: [EXTERNAL] [Patch 2/3] .mergify: Simplify Mergify rules using GitHub status checks </div> <o:p> </o:p> * 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. +# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent # # <a href="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"> 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</a> @@ -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<o:p></o:p> <o:p> </o:p> </div> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/77581">View/Reply Online (#77581)</a> | | <a target="_blank" href="https://groups.io/mt/84061194/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>