public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing
@ 2023-03-31 23:48 Michael Kubacki
  2023-03-31 23:50 ` [edk2-devel] " Sean
  2023-04-01  0:15 ` Michael D Kinney
  0 siblings, 2 replies; 4+ messages in thread
From: Michael Kubacki @ 2023-03-31 23:48 UTC (permalink / raw)
  To: devel; +Cc: Sean Brogan, Michael D Kinney

From: Michael Kubacki <michael.kubacki@microsoft.com>

Sets the rebase-strategy to "disabled" to prevent automatic
rebasing.

Rebasing can be done manually in the dependabot PR either through
the GitHub UI or the dependabot command.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b4e0b93b16ca..479440fe6397 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -20,6 +20,7 @@ updates:
       - "makubacki"
       - "mdkinney"
       - "spbrogan"
+    rebase-strategy: "disabled"
 
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -32,3 +33,4 @@ updates:
       - "makubacki"
       - "mdkinney"
       - "spbrogan"
+    rebase-strategy: "disabled"
-- 
2.40.0.windows.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [edk2-devel] [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing
  2023-03-31 23:48 [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing Michael Kubacki
@ 2023-03-31 23:50 ` Sean
  2023-04-02  2:26   ` Michael D Kinney
  2023-04-01  0:15 ` Michael D Kinney
  1 sibling, 1 reply; 4+ messages in thread
From: Sean @ 2023-03-31 23:50 UTC (permalink / raw)
  To: devel, mikuback; +Cc: Sean Brogan, Michael D Kinney

reviewed-by: Sean Brogan <sean.brogan@microsoft.com>


On 3/31/2023 4:48 PM, Michael Kubacki wrote:
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> Sets the rebase-strategy to "disabled" to prevent automatic
> rebasing.
>
> Rebasing can be done manually in the dependabot PR either through
> the GitHub UI or the dependabot command.
>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
>   .github/dependabot.yml | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/.github/dependabot.yml b/.github/dependabot.yml
> index b4e0b93b16ca..479440fe6397 100644
> --- a/.github/dependabot.yml
> +++ b/.github/dependabot.yml
> @@ -20,6 +20,7 @@ updates:
>         - "makubacki"
>         - "mdkinney"
>         - "spbrogan"
> +    rebase-strategy: "disabled"
>   
>     - package-ecosystem: "github-actions"
>       directory: "/"
> @@ -32,3 +33,4 @@ updates:
>         - "makubacki"
>         - "mdkinney"
>         - "spbrogan"
> +    rebase-strategy: "disabled"

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing
  2023-03-31 23:48 [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing Michael Kubacki
  2023-03-31 23:50 ` [edk2-devel] " Sean
@ 2023-04-01  0:15 ` Michael D Kinney
  1 sibling, 0 replies; 4+ messages in thread
From: Michael D Kinney @ 2023-04-01  0:15 UTC (permalink / raw)
  To: mikuback@linux.microsoft.com, devel@edk2.groups.io
  Cc: Sean Brogan, Kinney, Michael D

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>


> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Friday, March 31, 2023 4:49 PM
> To: devel@edk2.groups.io
> Cc: Sean Brogan <sean.brogan@microsoft.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing
> 
> From: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> Sets the rebase-strategy to "disabled" to prevent automatic
> rebasing.
> 
> Rebasing can be done manually in the dependabot PR either through
> the GitHub UI or the dependabot command.
> 
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
>  .github/dependabot.yml | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/.github/dependabot.yml b/.github/dependabot.yml
> index b4e0b93b16ca..479440fe6397 100644
> --- a/.github/dependabot.yml
> +++ b/.github/dependabot.yml
> @@ -20,6 +20,7 @@ updates:
>        - "makubacki"
>        - "mdkinney"
>        - "spbrogan"
> +    rebase-strategy: "disabled"
> 
>    - package-ecosystem: "github-actions"
>      directory: "/"
> @@ -32,3 +33,4 @@ updates:
>        - "makubacki"
>        - "mdkinney"
>        - "spbrogan"
> +    rebase-strategy: "disabled"
> --
> 2.40.0.windows.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [edk2-devel] [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing
  2023-03-31 23:50 ` [edk2-devel] " Sean
@ 2023-04-02  2:26   ` Michael D Kinney
  0 siblings, 0 replies; 4+ messages in thread
From: Michael D Kinney @ 2023-04-02  2:26 UTC (permalink / raw)
  To: devel@edk2.groups.io, spbrogan@outlook.com,
	mikuback@linux.microsoft.com
  Cc: Sean Brogan, Kinney, Michael D

Merged

PR: https://github.com/tianocore/edk2/pull/4228
Commit: https://github.com/tianocore/edk2/commit/fc00ff286a541c047b7d343e66ec10890b80d3ea

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean
> Sent: Friday, March 31, 2023 4:50 PM
> To: devel@edk2.groups.io; mikuback@linux.microsoft.com
> Cc: Sean Brogan <sean.brogan@microsoft.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: Re: [edk2-devel] [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing
> 
> reviewed-by: Sean Brogan <sean.brogan@microsoft.com>
> 
> 
> On 3/31/2023 4:48 PM, Michael Kubacki wrote:
> > From: Michael Kubacki <michael.kubacki@microsoft.com>
> >
> > Sets the rebase-strategy to "disabled" to prevent automatic
> > rebasing.
> >
> > Rebasing can be done manually in the dependabot PR either through
> > the GitHub UI or the dependabot command.
> >
> > Cc: Sean Brogan <sean.brogan@microsoft.com>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> > ---
> >   .github/dependabot.yml | 2 ++
> >   1 file changed, 2 insertions(+)
> >
> > diff --git a/.github/dependabot.yml b/.github/dependabot.yml
> > index b4e0b93b16ca..479440fe6397 100644
> > --- a/.github/dependabot.yml
> > +++ b/.github/dependabot.yml
> > @@ -20,6 +20,7 @@ updates:
> >         - "makubacki"
> >         - "mdkinney"
> >         - "spbrogan"
> > +    rebase-strategy: "disabled"
> >
> >     - package-ecosystem: "github-actions"
> >       directory: "/"
> > @@ -32,3 +33,4 @@ updates:
> >         - "makubacki"
> >         - "mdkinney"
> >         - "spbrogan"
> > +    rebase-strategy: "disabled"
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-04-02  2:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-31 23:48 [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing Michael Kubacki
2023-03-31 23:50 ` [edk2-devel] " Sean
2023-04-02  2:26   ` Michael D Kinney
2023-04-01  0:15 ` Michael D Kinney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox