From b3f321f2d7871868951cf73edb8fa4d5a88854a5 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Mon, 13 Feb 2023 08:04:41 -0800 Subject: .mergify/config.yml: Remove rebase_fallback attribute (deprecated) 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 Cc: Liming Gao Cc: Sean Brogan Signed-off-by: Michael Kubacki Reviewed-by: Michael D Kinney Reviewed-by: Rebecca Cran --- .mergify/config.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.mergify/config.yml') diff --git a/.mergify/config.yml b/.mergify/config.yml index bd6da4c..3471896 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -38,7 +38,6 @@ pull_request_rules: actions: queue: method: rebase - rebase_fallback: none name: default - name: Post a comment on a PR that can not be merged due to a merge conflict -- cgit v1.1