summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kubacki <michael.kubacki@microsoft.com>2023-02-13 08:04:41 -0800
committerMichael Kinney <michael.d.kinney@intel.com>2023-02-13 15:58:21 -0800
commitb3f321f2d7871868951cf73edb8fa4d5a88854a5 (patch)
tree637d760e8afedfd8a843e33ef05a14ec243ccc60
parent93a21b465bda44cecdd6347ad481ca6f55286547 (diff)
downloadedk2-b3f321f2d7871868951cf73edb8fa4d5a88854a5.tar.gz
edk2-b3f321f2d7871868951cf73edb8fa4d5a88854a5.tar.bz2
edk2-b3f321f2d7871868951cf73edb8fa4d5a88854a5.zip
.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 <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>
-rw-r--r--.mergify/config.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.mergify/config.yml b/.mergify/config.yml
index bd6da4c779..3471896a34 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