# * This file must be checked into the 'default' branch of a repo. Copies\r
# of this file on other branches of a repo are ignored by Mergify.\r
#\r
-# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR>\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
# https://github.com/apps/mergify\r
#\r
##\r
\r
-pull_request_rules:\r
+queue_rules:\r
+ - name: default\r
+ conditions:\r
+ - base~=(^main|^master|^stable/)\r
+ - label=push\r
\r
+pull_request_rules:\r
- name: Automatically merge a PR when all required checks pass and 'push' label is present\r
conditions:\r
- - base~=(^master|^stable/)\r
+ - base~=(^main|^master|^stable/)\r
- label=push\r
- - author=@tianocore/edk-ii-maintainers\r
- - status-success=tianocore.PatchCheck\r
- - status-success=Ubuntu GCC5 PR\r
- - status-success=Windows VS2019 PR\r
actions:\r
- merge:\r
- strict: true\r
+ queue:\r
method: rebase\r
-\r
- - name: Automatically close a PR when all required checks pass and 'push' label is not present\r
- conditions:\r
- - base~=(^master|^stable/)\r
- - -label=push\r
- - -closed\r
- - status-success=tianocore.PatchCheck\r
- - status-success=Ubuntu GCC5 PR\r
- - status-success=Windows VS2019 PR\r
- - status-success=Ubuntu GCC5 PR (FINISHED)\r
- - status-success=Windows VS2019 PR (FINISHED)\r
- actions:\r
- close:\r
- message: All checks passed. Auto close personal build.\r
+ rebase_fallback: none\r
+ name: default\r
\r
- name: Post a comment on a PR that can not be merged due to a merge conflict\r
conditions:\r
- - base~=(^master|^stable/)\r
+ - base~=(^main|^master|^stable/)\r
- conflict\r
actions:\r
comment:\r
message: PR can not be merged due to conflict. Please rebase and resubmit\r
-\r
- - name: Automatically close a PR that fails the EDK II Maintainers membership check and 'push' label is present\r
- conditions:\r
- - base~=(^master|^stable/)\r
- - label=push\r
- - -author=@tianocore/edk-ii-maintainers\r
- actions:\r
- close:\r
- message: PR submitter is not a member of the Tianocore EDK II Maintainers team\r
-\r
- - name: Post a comment on a PR if PatchCheck fails\r
- conditions:\r
- - base~=(^master|^stable/)\r
- - status-failure=tianocore.PatchCheck\r
- actions:\r
- comment:\r
- message: PR can not be merged due to a PatchCheck failure. Please resolve and resubmit\r
-\r
- - name: Post a comment on a PR if Ubuntu GCC5 fails\r
- conditions:\r
- - base~=(^master|^stable/)\r
- - status-failure=Ubuntu GCC5 PR\r
- - status-success=Ubuntu GCC5 PR (FAILED)\r
- actions:\r
- comment:\r
- message: PR can not be merged due to an Ubuntu GCC5 failure. Please resolve and resubmit\r
-\r
- - name: Post a comment on a PR if Windows VS2019 fails\r
- conditions:\r
- - base~=(^master|^stable/)\r
- - status-failure=Windows VS2019 PR\r
- - status-success=Windows VS2019 PR (FAILED)\r
- actions:\r
- comment:\r
- message: PR can not be merged due to a Windows VS2019 failure. Please resolve and resubmit\r