public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: Rebecca Cran <rebecca@os.amperecomputing.com>,
	"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Kinney, Michael D" <michael.d.kinney@intel.com>
Subject: Re: [edk2-devel] GitHub PR Code Review process now active
Date: Wed, 5 Jun 2024 23:27:19 +0000	[thread overview]
Message-ID: <CO1PR11MB49293DBC071BF0114592A61FD2F92@CO1PR11MB4929.namprd11.prod.outlook.com> (raw)
In-Reply-To: <bd19c7c9-923f-4420-b666-a58ee4e67ded@os.amperecomputing.com>

The Merge button may not work in that case either if there is
parallel activity by other developers or Mergify.  Using the
"push" label is recommended so Maintainers do not have to wait
and rebase.

I understand the desire to apply to other repos quickly.  Let's
work through some of these known issues for another week and
then evaluate if it should be applied to edk2-platforms yet.

Mike

> -----Original Message-----
> From: Rebecca Cran <rebecca@os.amperecomputing.com>
> Sent: Wednesday, June 5, 2024 3:48 PM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: Re: [edk2-devel] GitHub PR Code Review process now active
> 
> On 6/5/2024 4:21 PM, Michael D Kinney via groups.io wrote:
> > * Some PRs have been merged using the "Rebase and Merge" button in the
> >    PR after all required reviews completed and all CI checks pass. Instead,
> >    the "push" label should continue to be used. There does not appear to be
> >    any unexpected side effects from the "Rebase and Merge" button, but that
> >    option is not available if the PR needs to be rebased. This is what
> >    Mergify handles through a merge queue, so the easiest way to merge right
> >    now is the "push" label.
> >
> >    If the most recent commit was not performed by an EDK II Maintainers,
> then
> >    Mergify attempt to rebase may fail.
> >
> >      Mitigation #1: EDK II Maintainer perform a rebase
> >      Mitigation #2: Update Mergify to use a bot account with write
> permission
> >                     to perform rebase operations.
> >
> >    There was feedback earlier in the year that the git commit history does
> >    not indicate which maintainer was the committer.  Instead it always
> shows
> >    Mergify.
> >
> >    The use of GitHub Merge Queues will be evaluated to see if it can be
> used
> >    instead of Mergify and remove the need for the "push" label and allow
> the
> >    "Rebase and Merge" button to be used and avoid the Mergify permission
> issues.
> 
> So it sounds like using the "Merge" button is fine as long as the user
> understands they may need to rebase, wait for CI to finish and then merge?
> 
> Also, is there a timeline on enabling PRs for the other repos? I'd
> really like to switch to them for edk2-platforms, even if it means
> having to update settings in multiple repos as we find issues with the
> process.
> 
> 
> --
> Rebecca Cran



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119491): https://edk2.groups.io/g/devel/message/119491
Mute This Topic: https://groups.io/mt/106355103/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



  reply	other threads:[~2024-06-05 23:27 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-28 18:53 [edk2-devel] GitHub PR Code Review process now active Michael D Kinney
2024-05-29  6:38 ` Gerd Hoffmann
2024-05-29 15:00   ` Michael D Kinney
2024-05-29 16:38     ` Gerd Hoffmann
2024-05-29 18:09       ` Michael D Kinney
2024-05-29 18:18         ` Rebecca Cran
2024-05-29 18:27           ` Michael D Kinney
2024-05-29 19:25             ` Michael Kubacki
2024-05-29 20:06               ` Michael D Kinney
2024-05-30  0:51                 ` Michael Kubacki
2024-05-30 17:38                   ` Saloni Kasbekar
2024-05-30 18:00                     ` Michael D Kinney
2024-05-31  3:50                       ` Michael D Kinney
2024-05-31  4:36                         ` Michael Kubacki
2024-06-21  5:15                       ` Dhaval Sharma
2024-06-21  5:25                         ` Michael D Kinney
2024-05-30  8:32                 ` Gerd Hoffmann
2024-05-30 14:10                   ` Michael D Kinney
2024-05-29 10:40 ` Chang, Abner via groups.io
2024-05-29 14:44   ` Michael D Kinney
2024-05-29 14:48     ` Chang, Abner via groups.io
2024-05-30  0:41       ` Yao, Jiewen
2024-06-03 16:13 ` Neal Gompa
2024-06-03 16:26   ` Michael D Kinney
2024-06-03 18:46     ` Neal Gompa
2024-06-03 19:38       ` Michael D Kinney
2024-06-05 22:21         ` Michael D Kinney
2024-06-05 22:47           ` Rebecca Cran via groups.io
2024-06-05 23:27             ` Michael D Kinney [this message]
2024-06-16 22:08               ` Rebecca Cran
2024-06-06  1:21           ` Guo Dong
2024-06-06  1:37             ` Michael D Kinney
2024-06-04 13:23       ` Gerd Hoffmann

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=CO1PR11MB49293DBC071BF0114592A61FD2F92@CO1PR11MB4929.namprd11.prod.outlook.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