From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id B7E77AC1AF6 for ; Sun, 16 Jun 2024 22:08:30 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=2jLV5XYp1EAuJtVg9UBWSfC+PLQBaPTdIzANa+lGiWM=; c=relaxed/simple; d=groups.io; h=Feedback-ID:Message-ID:Date:MIME-Version:User-Agent:Subject:To:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1718575710; v=1; b=MET673Hah6qoHpqtoutnhtvf96RDVzCEX6wYtj/tyeDJ8DpXC2E+79i5Y88QmdelVvucQCqb uWPdlmLa/eqSSyMupTWQUaipT/FQ5BuW8MoycTWj/NZhCqoSfafVMeL8G/Hw9EaOheIVAm1CAUs sypFRiJ6XCDT5GpsPni3PbeC+9TrnPudR9a9saOfnotYAryaChQaGFLNMbeeZXnAJKypAFvY0Fe G52CEWSKg0UligXiTo6Go4mk9ZSj3kae9B891Fuijhb/mzglqnJWSr5t+Rmtv2Vkd4JS5RwWCKV WSbb87bTkYFsJXHsGWJJ1CW5vRy3mmtYaOZAwUGSn5c9A== X-Received: by 127.0.0.2 with SMTP id jK6HYY7687511xZkVKRkMqyk; Sun, 16 Jun 2024 15:08:29 -0700 X-Received: from wfout6-smtp.messagingengine.com (wfout6-smtp.messagingengine.com [64.147.123.149]) by mx.groups.io with SMTP id smtpd.web10.43685.1718575703269928386 for ; Sun, 16 Jun 2024 15:08:23 -0700 X-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.west.internal (Postfix) with ESMTP id 648E21C000A9; Sun, 16 Jun 2024 18:08:22 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sun, 16 Jun 2024 18:08:22 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedvgedgtdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefkffggfgfuvfhfhfgjtgfgsehtje ertddtvdejnecuhfhrohhmpeftvggsvggttggrucevrhgrnhcuoehrvggsvggttggrsegs shguihhordgtohhmqeenucggtffrrghtthgvrhhnpeegveevveettddtieetfeehgeelte fgvdeukefftefgffeuheffvedtveevjedvkeenucffohhmrghinhepghhrohhuphhsrdhi ohenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehrvg gsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Jun 2024 18:08:21 -0400 (EDT) Message-ID: <9dc7002a-350a-4b72-a655-5aba1768d6d7@bsdio.com> Date: Sun, 16 Jun 2024 16:08:11 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [edk2-devel] GitHub PR Code Review process now active To: devel@edk2.groups.io, michael.d.kinney@intel.com References: From: "Rebecca Cran" In-Reply-To: Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Sun, 16 Jun 2024 15:08:23 -0700 Resent-From: rebecca@bsdio.com Reply-To: devel@edk2.groups.io,rebecca@bsdio.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 5mGARVPuk3wHH6V6koMEL2QRx7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=MET673Ha; dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io Hi Mike, I was wondering if you think we're ready to switch over to PRs on the=20 other repos yet? I'm pushing for this because I have a set of changes waiting to go in=20 but we've decided to wait until we can use the easier PR process. Should we discuss it in tomorrow's (Monday) Tools call? --=20 Rebecca Cran On 6/5/24 5:27 PM, Michael D Kinney wrote: > 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 >> Sent: Wednesday, June 5, 2024 3:48 PM >> To: devel@edk2.groups.io; Kinney, Michael D >> 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. Ins= tead, >>> 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 Maintainer= s, >> 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 b= e >> used >>> instead of Mergify and remove the need for the "push" label and all= ow >> the >>> "Rebase and Merge" button to be used and avoid the Mergify permissi= on >> 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 merg= e? >> >> 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 > > >=20 > > -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119590): https://edk2.groups.io/g/devel/message/119590 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] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-