mirror of
https://github.com/acidanthera/audk.git
synced 2025-04-08 17:05:09 +02:00
f3040bed3c
The following message is visible on mergify runs: "The configuration uses the deprecated merge_method attribute of the queue action in one or more pull_request_rules. It must now be used under the queue_rules configuration." With the following warning: "A brownout is planned on August 26th, 2024. This option will be removed on September 23rd, 2024." This change updates the configuration file to comply with the new format. Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
50 lines
1.6 KiB
YAML
50 lines
1.6 KiB
YAML
## @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.<BR>
|
|
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
#
|
|
# https://github.com/apps/mergify
|
|
# https://doc.mergify.io/
|
|
#
|
|
##
|
|
|
|
queue_rules:
|
|
- name: default
|
|
queue_conditions:
|
|
- base~=(^main|^master|^stable/)
|
|
- label=push
|
|
merge_method: rebase
|
|
|
|
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:
|
|
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
|