1. Edk2 | Devel
  2. Topics

[PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing

Michael Kubacki
 

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

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@...>
Cc: Michael D Kinney <michael.d.kinney@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...>
---
.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"
=20
- package-ecosystem: "github-actions"
directory: "/"
@@ -32,3 +33,4 @@ updates:
- "makubacki"
- "mdkinney"
- "spbrogan"
+ rebase-strategy: "disabled"
--=20
2.40.0.windows.1
Sean
 

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

On 3/31/2023 4:48 PM, Michael Kubacki wrote:
From: Michael Kubacki <michael.kubacki@...>

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@...>
Cc: Michael D Kinney <michael.d.kinney@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...>
---
.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"
Michael D Kinney
 

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

-----Original Message-----
From: mikuback@... <mikuback@...>
Sent: Friday, March 31, 2023 4:49 PM
To: devel@edk2.groups.io
Cc: Sean Brogan <sean.brogan@...>; Kinney, Michael D <michael.d.kinney@...>
Subject: [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing

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

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@...>
Cc: Michael D Kinney <michael.d.kinney@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...>
---
.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
Michael D Kinney
 

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@...
Cc: Sean Brogan <sean.brogan@...>; Kinney, Michael D <michael.d.kinney@...>
Subject: Re: [edk2-devel] [PATCH v1 1/1] .github/dependabot.yml: Disable automatic rebasing

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


On 3/31/2023 4:48 PM, Michael Kubacki wrote:
From: Michael Kubacki <michael.kubacki@...>

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@...>
Cc: Michael D Kinney <michael.d.kinney@...>
Signed-off-by: Michael Kubacki <michael.kubacki@...>
---
.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"

1 - 4 of 4