Re: [PATCH v1 1/1] .mergify/config.yml: Remove rebase_fallback attribute (deprecated)

["Michael D Kinney" <michael.d.kinney@intel.com>]

Changes to mergify configuration require manual merge.  Push label does not work.

Merged

PR: https://github.com/tianocore/edk2/pull/4037
Commit: https://github.com/tianocore/edk2/commit/b3f321f2d7871868951cf73edb8fa4d5a88854a5

Mike


> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Monday, February 13, 2023 2:50 PM
> To: mikuback@linux.microsoft.com; devel@edk2.groups.io
> Cc: Gao, Liming <gaoliming@byosoft.com.cn>; Sean Brogan <sean.brogan@microsoft.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: RE: [PATCH v1 1/1] .mergify/config.yml: Remove rebase_fallback attribute (deprecated)
> 
> Hi Michael,
> 
> Thank you for fixing this.  I will merge it immediately.
> 
> EDK II CI is blocked today without this change.
> 
> Mike
> 
> > -----Original Message-----
> > From: Kinney, Michael D <michael.d.kinney@intel.com>
> > Sent: Monday, February 13, 2023 11:56 AM
> > To: mikuback@linux.microsoft.com; devel@edk2.groups.io
> > Cc: Gao, Liming <gaoliming@byosoft.com.cn>; Sean Brogan <sean.brogan@microsoft.com>; Kinney, Michael D
> > <michael.d.kinney@intel.com>
> > Subject: RE: [PATCH v1 1/1] .mergify/config.yml: Remove rebase_fallback attribute (deprecated)
> >
> > Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
> >
> >
> > > -----Original Message-----
> > > From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> > > Sent: Monday, February 13, 2023 8:05 AM
> > > To: devel@edk2.groups.io
> > > Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Sean Brogan
> > > <sean.brogan@microsoft.com>
> > > Subject: [PATCH v1 1/1] .mergify/config.yml: Remove rebase_fallback attribute (deprecated)
> > >
> > > 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
> > > --
> > > 2.28.0.windows.1