mirror of
https://github.com/acidanthera/audk.git
synced 2025-04-08 17:05:09 +02:00
b3f321f2d7
PR builds and CI are currently broken due to a mergify brownout today because edk2 uses the `rebase_fallback` attribute of the `queue` action. Message from Mergify/Summary: ``` The configuration uses the deprecated rebase_fallback attribute of the queue action. A brownout is planned on February 13th, 2023. This option will be removed on March 13th, 2023. For more information: https://docs.mergify.com/actions/queue/ ``` Therefore, this change removes the attribute per the guidance in the following changelog message to retain existing behavior. https://changelog.mergify.com/changelog/rebasefallback-is-deprecated ``` The option rebase_fallback is now deprecated and should not be used anymore. Mergify will always report errors in the future if a rebase merge is impossible. ``` Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Sean Brogan <sean.brogan@microsoft.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Rebecca Cran <rebecca@bsdio.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
|
|
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
|
|
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
|