From: "Rebecca Cran" <rebecca@bsdio.com>
To: devel@edk2.groups.io, mikuback@linux.microsoft.com
Cc: Michael D Kinney <michael.d.kinney@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
Sean Brogan <sean.brogan@microsoft.com>
Subject: Re: [edk2-devel] [PATCH v1 1/1] .mergify/config.yml: Remove rebase_fallback attribute (deprecated)
Date: Mon, 13 Feb 2023 12:20:42 -0700 [thread overview]
Message-ID: <8baa24fa-bd54-8ae9-3781-261f3d8ab25b@bsdio.com> (raw)
In-Reply-To: <20230213160441.2121-1-mikuback@linux.microsoft.com>
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
On 2/13/23 09:04, Michael Kubacki wrote:
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> 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>
> ---
>
> Notes:
> PR with change is here:
> https://github.com/tianocore/edk2/pull/4035
>
> .mergify/config.yml | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/.mergify/config.yml b/.mergify/config.yml
> index bd6da4c77937..3471896a3495 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
next prev parent reply other threads:[~2023-02-13 19:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 16:04 [PATCH v1 1/1] .mergify/config.yml: Remove rebase_fallback attribute (deprecated) Michael Kubacki
2023-02-13 19:20 ` Rebecca Cran [this message]
2023-02-13 19:56 ` Michael D Kinney
2023-02-13 22:50 ` Michael D Kinney
2023-02-14 0:00 ` Michael D Kinney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8baa24fa-bd54-8ae9-3781-261f3d8ab25b@bsdio.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox