* [PATCH] Maintainers.txt: Update reviewer email address @ 2019-12-06 16:28 Maciej Rabeda 2019-12-10 5:37 ` Wu, Jiaxin 0 siblings, 1 reply; 12+ messages in thread From: Maciej Rabeda @ 2019-12-06 16:28 UTC (permalink / raw) To: devel; +Cc: Jiaxin Wu, Siyuan Fu Created new email account that will not append legal disclaimers to my responses/patches. Cc: Jiaxin Wu <jiaxin.wu@intel.com> Cc: Siyuan Fu <siyuan.fu@intel.com> Signed-off-by: Maciej Rabeda <maciej.rabeda@linux.intel.com> --- Maintainers.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maintainers.txt b/Maintainers.txt index 180ad35d0976..246583204139 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -379,7 +379,7 @@ F: NetworkPkg/ W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg M: Jiaxin Wu <jiaxin.wu@intel.com> R: Siyuan Fu <siyuan.fu@intel.com> -R: Maciej Rabeda <maciej.rabeda@intel.com> +R: Maciej Rabeda <maciej.rabeda@linux.intel.com> OvmfPkg F: OvmfPkg/ -- 2.24.0.windows.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] Maintainers.txt: Update reviewer email address 2019-12-06 16:28 [PATCH] Maintainers.txt: Update reviewer email address Maciej Rabeda @ 2019-12-10 5:37 ` Wu, Jiaxin 2019-12-10 8:35 ` [edk2-devel] " Rabeda, Maciej 0 siblings, 1 reply; 12+ messages in thread From: Wu, Jiaxin @ 2019-12-10 5:37 UTC (permalink / raw) To: Maciej Rabeda, devel@edk2.groups.io; +Cc: Fu, Siyuan Hi Maciej, I think now you can update you as one of NetworkPkg maintainers, if so, you can get the edk2 repo write privilege, which can facility your future contribution. I will still keep the maintainer role until next month. After that, both Siyuan and I will be reviewer, so, we can still help the technical review/support. If no objection, just do that:). Thanks, Jiaxin > -----Original Message----- > From: Maciej Rabeda <maciej.rabeda@linux.intel.com> > Sent: Saturday, December 7, 2019 12:29 AM > To: devel@edk2.groups.io > Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com> > Subject: [PATCH] Maintainers.txt: Update reviewer email address > > Created new email account that will not append legal disclaimers to > my responses/patches. > > Cc: Jiaxin Wu <jiaxin.wu@intel.com> > Cc: Siyuan Fu <siyuan.fu@intel.com> > Signed-off-by: Maciej Rabeda <maciej.rabeda@linux.intel.com> > --- > Maintainers.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Maintainers.txt b/Maintainers.txt > index 180ad35d0976..246583204139 100644 > --- a/Maintainers.txt > +++ b/Maintainers.txt > @@ -379,7 +379,7 @@ F: NetworkPkg/ > W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg > > M: Jiaxin Wu <jiaxin.wu@intel.com> > > R: Siyuan Fu <siyuan.fu@intel.com> > > -R: Maciej Rabeda <maciej.rabeda@intel.com> > > +R: Maciej Rabeda <maciej.rabeda@linux.intel.com> > > > > OvmfPkg > > F: OvmfPkg/ > > -- > 2.24.0.windows.2 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 5:37 ` Wu, Jiaxin @ 2019-12-10 8:35 ` Rabeda, Maciej 2019-12-10 9:10 ` Laszlo Ersek 0 siblings, 1 reply; 12+ messages in thread From: Rabeda, Maciej @ 2019-12-10 8:35 UTC (permalink / raw) To: devel@edk2.groups.io, Wu, Jiaxin, Maciej Rabeda, Kinney, Michael D, Laszlo Ersek, Gao, Liming Cc: Fu, Siyuan Ok, Jiaxin :) Mike, Laszlo, Liming, Do you know who I should contact in regards to maintainership role transition (edk2 write access etc.)? Thanks! Maciej -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, Jiaxin Sent: Tuesday, December 10, 2019 06:38 To: Maciej Rabeda <maciej.rabeda@linux.intel.com>; devel@edk2.groups.io Cc: Fu, Siyuan <siyuan.fu@intel.com> Subject: Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address Hi Maciej, I think now you can update you as one of NetworkPkg maintainers, if so, you can get the edk2 repo write privilege, which can facility your future contribution. I will still keep the maintainer role until next month. After that, both Siyuan and I will be reviewer, so, we can still help the technical review/support. If no objection, just do that:). Thanks, Jiaxin > -----Original Message----- > From: Maciej Rabeda <maciej.rabeda@linux.intel.com> > Sent: Saturday, December 7, 2019 12:29 AM > To: devel@edk2.groups.io > Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com> > Subject: [PATCH] Maintainers.txt: Update reviewer email address > > Created new email account that will not append legal disclaimers to my > responses/patches. > > Cc: Jiaxin Wu <jiaxin.wu@intel.com> > Cc: Siyuan Fu <siyuan.fu@intel.com> > Signed-off-by: Maciej Rabeda <maciej.rabeda@linux.intel.com> > --- > Maintainers.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Maintainers.txt b/Maintainers.txt index > 180ad35d0976..246583204139 100644 > --- a/Maintainers.txt > +++ b/Maintainers.txt > @@ -379,7 +379,7 @@ F: NetworkPkg/ > W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg > > M: Jiaxin Wu <jiaxin.wu@intel.com> > > R: Siyuan Fu <siyuan.fu@intel.com> > > -R: Maciej Rabeda <maciej.rabeda@intel.com> > > +R: Maciej Rabeda <maciej.rabeda@linux.intel.com> > > > > OvmfPkg > > F: OvmfPkg/ > > -- > 2.24.0.windows.2 -------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 8:35 ` [edk2-devel] " Rabeda, Maciej @ 2019-12-10 9:10 ` Laszlo Ersek 2019-12-10 9:32 ` Rabeda, Maciej 2019-12-10 10:27 ` Philippe Mathieu-Daudé 0 siblings, 2 replies; 12+ messages in thread From: Laszlo Ersek @ 2019-12-10 9:10 UTC (permalink / raw) To: Rabeda, Maciej, devel@edk2.groups.io, Wu, Jiaxin, Maciej Rabeda, Kinney, Michael D, Gao, Liming Cc: Fu, Siyuan On 12/10/19 09:35, Rabeda, Maciej wrote: > Ok, Jiaxin :) > > Mike, Laszlo, Liming, > > Do you know who I should contact in regards to maintainership role > transition (edk2 write access etc.)? Write access directly to the edk2 repo has been revoked from maintainers. Documentation updates are underway by Mike, to my understanding. Please see the following threads: - [edk2-devel] EDK II Maintainers - EDK II CI is now active on edk2/master http://mid.mail-archive.com/E92EE9817A31E24EB0585FDF735412F5B9E173A1@ORSMSX113.amr.corp.intel.com https://edk2.groups.io/g/devel/message/50407 - [edk2-devel] [Patch wiki v2] EDK II CI: Update Phase 1 details and admin settings http://mid.mail-archive.com/20191202175630.12788-1-michael.d.kinney@intel.com https://edk2.groups.io/g/devel/message/51556 - [edk2-devel] [Patch wiki v2] EDK II Dev Process: Change push to GitHub pull request http://mid.mail-archive.com/20191202180131.876-1-michael.d.kinney@intel.com https://edk2.groups.io/g/devel/message/51557 For a brief (personal, informal) summary, I can offer (quoting an email I sent earlier): - prepare a local topic branch, on top of master, with the review tags in place, such that (per the earlier method) you'd ff-push that topic branch as the new edk2 master. - instead of pushing it to edk2, push it to your personal edk2 repo on github.com - log in to github.com, and initiate a pull request against edk2/master, from your personal topic branch - as soon as the pull request has been filed, locate the "labels" box to the right, and apply the "push" label. Once the CI tests complete, the branch will be merged (fast-forwarded). The official description will be in the wiki, containing even screenshots. See the third reference above, from Mike. For now, those updates can be seen rendered in Mike's clone of the Wiki, namely at <https://github.com/mdkinney/edk2/wiki/EDK-II-Development-Process>. Thanks Laszlo > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, Jiaxin > Sent: Tuesday, December 10, 2019 06:38 > To: Maciej Rabeda <maciej.rabeda@linux.intel.com>; devel@edk2.groups.io > Cc: Fu, Siyuan <siyuan.fu@intel.com> > Subject: Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address > > Hi Maciej, > > I think now you can update you as one of NetworkPkg maintainers, if so, you can get the edk2 repo write privilege, which can facility your future contribution. I will still keep the maintainer role until next month. After that, both Siyuan and I will be reviewer, so, we can still help the technical review/support. > > If no objection, just do that:). > > Thanks, > Jiaxin > >> -----Original Message----- >> From: Maciej Rabeda <maciej.rabeda@linux.intel.com> >> Sent: Saturday, December 7, 2019 12:29 AM >> To: devel@edk2.groups.io >> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com> >> Subject: [PATCH] Maintainers.txt: Update reviewer email address >> >> Created new email account that will not append legal disclaimers to my >> responses/patches. >> >> Cc: Jiaxin Wu <jiaxin.wu@intel.com> >> Cc: Siyuan Fu <siyuan.fu@intel.com> >> Signed-off-by: Maciej Rabeda <maciej.rabeda@linux.intel.com> >> --- >> Maintainers.txt | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/Maintainers.txt b/Maintainers.txt index >> 180ad35d0976..246583204139 100644 >> --- a/Maintainers.txt >> +++ b/Maintainers.txt >> @@ -379,7 +379,7 @@ F: NetworkPkg/ >> W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg >> >> M: Jiaxin Wu <jiaxin.wu@intel.com> >> >> R: Siyuan Fu <siyuan.fu@intel.com> >> >> -R: Maciej Rabeda <maciej.rabeda@intel.com> >> >> +R: Maciej Rabeda <maciej.rabeda@linux.intel.com> >> >> >> >> OvmfPkg >> >> F: OvmfPkg/ >> >> -- >> 2.24.0.windows.2 > > > > > -------------------------------------------------------------------- > > Intel Technology Poland sp. z o.o. > ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. > > Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek > przegladanie lub rozpowszechnianie jest zabronione. > This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by > others is strictly prohibited. > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 9:10 ` Laszlo Ersek @ 2019-12-10 9:32 ` Rabeda, Maciej 2019-12-10 12:36 ` Laszlo Ersek 2019-12-10 10:27 ` Philippe Mathieu-Daudé 1 sibling, 1 reply; 12+ messages in thread From: Rabeda, Maciej @ 2019-12-10 9:32 UTC (permalink / raw) To: Laszlo Ersek, devel@edk2.groups.io, Wu, Jiaxin, Maciej Rabeda, Kinney, Michael D, Gao, Liming Cc: Fu, Siyuan Laszlo, Understood, Jiaxin and I have successfully went with one patch via PR flow already. I was wondering whether any extra actions are required so that I will be able to apply 'push' label to my/other contributor's pull requests to tianocore/edk2. I assume that the list of people that can apply that label is limited to EDK II Maintainers or is my assumption wrong? Thanks! Maciej -----Original Message----- From: Laszlo Ersek <lersek@redhat.com> Sent: Tuesday, December 10, 2019 10:11 To: Rabeda, Maciej <maciej.rabeda@intel.com>; devel@edk2.groups.io; Wu, Jiaxin <jiaxin.wu@intel.com>; Maciej Rabeda <maciej.rabeda@linux.intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com> Cc: Fu, Siyuan <siyuan.fu@intel.com> Subject: Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address On 12/10/19 09:35, Rabeda, Maciej wrote: > Ok, Jiaxin :) > > Mike, Laszlo, Liming, > > Do you know who I should contact in regards to maintainership role > transition (edk2 write access etc.)? Write access directly to the edk2 repo has been revoked from maintainers. Documentation updates are underway by Mike, to my understanding. Please see the following threads: - [edk2-devel] EDK II Maintainers - EDK II CI is now active on edk2/master http://mid.mail-archive.com/E92EE9817A31E24EB0585FDF735412F5B9E173A1@ORSMSX113.amr.corp.intel.com https://edk2.groups.io/g/devel/message/50407 - [edk2-devel] [Patch wiki v2] EDK II CI: Update Phase 1 details and admin settings http://mid.mail-archive.com/20191202175630.12788-1-michael.d.kinney@intel.com https://edk2.groups.io/g/devel/message/51556 - [edk2-devel] [Patch wiki v2] EDK II Dev Process: Change push to GitHub pull request http://mid.mail-archive.com/20191202180131.876-1-michael.d.kinney@intel.com https://edk2.groups.io/g/devel/message/51557 For a brief (personal, informal) summary, I can offer (quoting an email I sent earlier): - prepare a local topic branch, on top of master, with the review tags in place, such that (per the earlier method) you'd ff-push that topic branch as the new edk2 master. - instead of pushing it to edk2, push it to your personal edk2 repo on github.com - log in to github.com, and initiate a pull request against edk2/master, from your personal topic branch - as soon as the pull request has been filed, locate the "labels" box to the right, and apply the "push" label. Once the CI tests complete, the branch will be merged (fast-forwarded). The official description will be in the wiki, containing even screenshots. See the third reference above, from Mike. For now, those updates can be seen rendered in Mike's clone of the Wiki, namely at <https://github.com/mdkinney/edk2/wiki/EDK-II-Development-Process>. Thanks Laszlo > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, > Jiaxin > Sent: Tuesday, December 10, 2019 06:38 > To: Maciej Rabeda <maciej.rabeda@linux.intel.com>; > devel@edk2.groups.io > Cc: Fu, Siyuan <siyuan.fu@intel.com> > Subject: Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer > email address > > Hi Maciej, > > I think now you can update you as one of NetworkPkg maintainers, if so, you can get the edk2 repo write privilege, which can facility your future contribution. I will still keep the maintainer role until next month. After that, both Siyuan and I will be reviewer, so, we can still help the technical review/support. > > If no objection, just do that:). > > Thanks, > Jiaxin > >> -----Original Message----- >> From: Maciej Rabeda <maciej.rabeda@linux.intel.com> >> Sent: Saturday, December 7, 2019 12:29 AM >> To: devel@edk2.groups.io >> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Fu, Siyuan >> <siyuan.fu@intel.com> >> Subject: [PATCH] Maintainers.txt: Update reviewer email address >> >> Created new email account that will not append legal disclaimers to >> my responses/patches. >> >> Cc: Jiaxin Wu <jiaxin.wu@intel.com> >> Cc: Siyuan Fu <siyuan.fu@intel.com> >> Signed-off-by: Maciej Rabeda <maciej.rabeda@linux.intel.com> >> --- >> Maintainers.txt | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/Maintainers.txt b/Maintainers.txt index >> 180ad35d0976..246583204139 100644 >> --- a/Maintainers.txt >> +++ b/Maintainers.txt >> @@ -379,7 +379,7 @@ F: NetworkPkg/ >> W: https://github.com/tianocore/tianocore.github.io/wiki/NetworkPkg >> >> M: Jiaxin Wu <jiaxin.wu@intel.com> >> >> R: Siyuan Fu <siyuan.fu@intel.com> >> >> -R: Maciej Rabeda <maciej.rabeda@intel.com> >> >> +R: Maciej Rabeda <maciej.rabeda@linux.intel.com> >> >> >> >> OvmfPkg >> >> F: OvmfPkg/ >> >> -- >> 2.24.0.windows.2 > > > > > -------------------------------------------------------------------- > > Intel Technology Poland sp. z o.o. > ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. > > Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego > adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. > This e-mail and any attachments may contain confidential material for > the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. > -------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 9:32 ` Rabeda, Maciej @ 2019-12-10 12:36 ` Laszlo Ersek 2019-12-10 15:01 ` Rabeda, Maciej 0 siblings, 1 reply; 12+ messages in thread From: Laszlo Ersek @ 2019-12-10 12:36 UTC (permalink / raw) To: Rabeda, Maciej, devel@edk2.groups.io, Wu, Jiaxin, Maciej Rabeda, Kinney, Michael D, Gao, Liming Cc: Fu, Siyuan On 12/10/19 10:32, Rabeda, Maciej wrote: > Laszlo, > > Understood, Jiaxin and I have successfully went with one patch via PR flow already. > I was wondering whether any extra actions are required so that I will be able to apply 'push' label to my/other contributor's pull requests to tianocore/edk2. Important detail: at this stage, we are not dealing with github.com pull requests from *others*. Only following use cases are in scope: (1) maintainer submits a PR, or reopen a PR they submitted earlier, for the purposes of a personal CI build (no "push" label) (2) same as (1), except with the "push" label set, for the purposes of an actual fast-forward merge (not just personal CI build); with the topic branch that's subject to the merge consisting purely of patches that have been posted *and reviewed* earlier on the list. (3) same as (1), except with "non-maintainer contributor" replacing "maintainer" A PR, submitted by anyone for the edk2 project on github.com, such that it does not fall in any of the above categories, should be rejected, just like before. Patch submission and review continues on the mailing list. To put differently, you should *only* set the push label on a PR that: - you have submitted / reopened yourself; and - the topic branch subject to the merge consists only of patches that you authored, or applied from others from the list, *and* have been reviewed on the list; and - the topic branch subject to the merge carries all the feedback tags given on the list (such as Tested-by, Acked-by, Reviewed-by). Basically, as a maintainer, you need to: - follow the list, - once there are approved patches for NetworkPkg, pick them up with "git-am" in a local topic branch, - rebase the local topic branch with "git-rebase", so you can apply the R-b / T-b / A-b tags from the list to the commit messages, - push the above topic branch to your own github repo, - submit a PR for the topic branch, - set the "push" label on the PR. "pick up patches from the list" and "pick up feedback tags from the list" are *not* optional. > I assume that the list of people that can apply that label is limited to EDK II Maintainers or is my assumption wrong? Technically, anyone can create a pull request, and my understanding is that anyone can set the "push" label on their pull request. However (AIUI), the mergify bot will reject and close any PR with the "push" label set if the PR was not submitted by a maintainer in the first place. Thanks Laszlo ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 12:36 ` Laszlo Ersek @ 2019-12-10 15:01 ` Rabeda, Maciej 2019-12-10 18:15 ` Laszlo Ersek 0 siblings, 1 reply; 12+ messages in thread From: Rabeda, Maciej @ 2019-12-10 15:01 UTC (permalink / raw) To: Laszlo Ersek, devel@edk2.groups.io, Wu, Jiaxin, Maciej Rabeda, Kinney, Michael D, Gao, Liming Cc: Fu, Siyuan Laszlo, Thanks for a thorough explanation of the process :) It looks like one extra step for maintainership transition seems is identified: "However (AIUI), the mergify bot will reject and close any PR with the "push" label set if the PR was not submitted by a maintainer in the first place" For maintainer identification process, where does the mergify bot get the maintainer list from? Do you know who should I ask to be added to that list? Thanks! Maciej -----Original Message----- From: Laszlo Ersek <lersek@redhat.com> Sent: Tuesday, December 10, 2019 13:37 To: Rabeda, Maciej <maciej.rabeda@intel.com>; devel@edk2.groups.io; Wu, Jiaxin <jiaxin.wu@intel.com>; Maciej Rabeda <maciej.rabeda@linux.intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com> Cc: Fu, Siyuan <siyuan.fu@intel.com> Subject: Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address On 12/10/19 10:32, Rabeda, Maciej wrote: > Laszlo, > > Understood, Jiaxin and I have successfully went with one patch via PR flow already. > I was wondering whether any extra actions are required so that I will be able to apply 'push' label to my/other contributor's pull requests to tianocore/edk2. Important detail: at this stage, we are not dealing with github.com pull requests from *others*. Only following use cases are in scope: (1) maintainer submits a PR, or reopen a PR they submitted earlier, for the purposes of a personal CI build (no "push" label) (2) same as (1), except with the "push" label set, for the purposes of an actual fast-forward merge (not just personal CI build); with the topic branch that's subject to the merge consisting purely of patches that have been posted *and reviewed* earlier on the list. (3) same as (1), except with "non-maintainer contributor" replacing "maintainer" A PR, submitted by anyone for the edk2 project on github.com, such that it does not fall in any of the above categories, should be rejected, just like before. Patch submission and review continues on the mailing list. To put differently, you should *only* set the push label on a PR that: - you have submitted / reopened yourself; and - the topic branch subject to the merge consists only of patches that you authored, or applied from others from the list, *and* have been reviewed on the list; and - the topic branch subject to the merge carries all the feedback tags given on the list (such as Tested-by, Acked-by, Reviewed-by). Basically, as a maintainer, you need to: - follow the list, - once there are approved patches for NetworkPkg, pick them up with "git-am" in a local topic branch, - rebase the local topic branch with "git-rebase", so you can apply the R-b / T-b / A-b tags from the list to the commit messages, - push the above topic branch to your own github repo, - submit a PR for the topic branch, - set the "push" label on the PR. "pick up patches from the list" and "pick up feedback tags from the list" are *not* optional. > I assume that the list of people that can apply that label is limited to EDK II Maintainers or is my assumption wrong? Technically, anyone can create a pull request, and my understanding is that anyone can set the "push" label on their pull request. However (AIUI), the mergify bot will reject and close any PR with the "push" label set if the PR was not submitted by a maintainer in the first place. Thanks Laszlo -------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 15:01 ` Rabeda, Maciej @ 2019-12-10 18:15 ` Laszlo Ersek 2019-12-10 18:16 ` Laszlo Ersek 0 siblings, 1 reply; 12+ messages in thread From: Laszlo Ersek @ 2019-12-10 18:15 UTC (permalink / raw) To: Rabeda, Maciej, devel@edk2.groups.io, Wu, Jiaxin, Maciej Rabeda, Kinney, Michael D, Gao, Liming Cc: Fu, Siyuan On 12/10/19 16:01, Rabeda, Maciej wrote: > Laszlo, > > Thanks for a thorough explanation of the process :) > It looks like one extra step for maintainership transition seems is identified: > "However (AIUI), the mergify bot will reject and close any PR with the "push" label set if the PR was not submitted by a maintainer in the first place" > > For maintainer identification process, where does the mergify bot get the maintainer list from? I *think* it is represented through membership in the "tianocore" organization on github.com. https://github.com/orgs/tianocore/people I'm not sure but I imagine different people could have different permissions associated with them, in this org. > Do you know who should I ask to be added to that list? If I remember correctly, Mike can manage such memberships / rights. Thanks! Laszlo ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 18:15 ` Laszlo Ersek @ 2019-12-10 18:16 ` Laszlo Ersek 2019-12-10 18:27 ` Michael D Kinney 0 siblings, 1 reply; 12+ messages in thread From: Laszlo Ersek @ 2019-12-10 18:16 UTC (permalink / raw) To: Rabeda, Maciej, devel@edk2.groups.io, Wu, Jiaxin, Maciej Rabeda, Kinney, Michael D, Gao, Liming Cc: Fu, Siyuan On 12/10/19 19:15, Laszlo Ersek wrote: > On 12/10/19 16:01, Rabeda, Maciej wrote: >> Laszlo, >> >> Thanks for a thorough explanation of the process :) >> It looks like one extra step for maintainership transition seems is identified: >> "However (AIUI), the mergify bot will reject and close any PR with the "push" label set if the PR was not submitted by a maintainer in the first place" >> >> For maintainer identification process, where does the mergify bot get the maintainer list from? > > I *think* it is represented through membership in the "tianocore" > organization on github.com. > > https://github.com/orgs/tianocore/people > > I'm not sure but I imagine different people could have different > permissions associated with them, in this org. Seems like there is a subgroup (?) called "tianocore/edk-ii-maintainers". Thanks Laszlo >> Do you know who should I ask to be added to that list? > > If I remember correctly, Mike can manage such memberships / rights. > > Thanks! > Laszlo > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 18:16 ` Laszlo Ersek @ 2019-12-10 18:27 ` Michael D Kinney 2019-12-10 22:05 ` Rabeda, Maciej 0 siblings, 1 reply; 12+ messages in thread From: Michael D Kinney @ 2019-12-10 18:27 UTC (permalink / raw) To: devel@edk2.groups.io, lersek@redhat.com, Rabeda, Maciej, Wu, Jiaxin, Maciej Rabeda, Gao, Liming, Kinney, Michael D Cc: Fu, Siyuan Hi Maciej, Once a patch review is complete that updates Maintainers.txt with a new maintainer, one of the existing maintainers should submit a PR to get Maintainer.txt updated in edk2/master. In the corner case where none of the existing maintainers are available to submit this PR, one of the stewards can support this PR. At that point, the new maintainer needs to be added to the TianoCore EDK II Maintainers Team so the new maintainer has The ability to set the 'push' label on PRs they want merged into edk2/master. The new maintainer should send an email to the mailing list requesting membership in the TianoCore EDK II Maintainers team. Thanks, Mike > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On > Behalf Of Laszlo Ersek > Sent: Tuesday, December 10, 2019 10:17 AM > To: Rabeda, Maciej <maciej.rabeda@intel.com>; > devel@edk2.groups.io; Wu, Jiaxin <jiaxin.wu@intel.com>; > Maciej Rabeda <maciej.rabeda@linux.intel.com>; Kinney, > Michael D <michael.d.kinney@intel.com>; Gao, Liming > <liming.gao@intel.com> > Cc: Fu, Siyuan <siyuan.fu@intel.com> > Subject: Re: [edk2-devel] [PATCH] Maintainers.txt: > Update reviewer email address > > On 12/10/19 19:15, Laszlo Ersek wrote: > > On 12/10/19 16:01, Rabeda, Maciej wrote: > >> Laszlo, > >> > >> Thanks for a thorough explanation of the process :) > >> It looks like one extra step for maintainership > transition seems is identified: > >> "However (AIUI), the mergify bot will reject and > close any PR with the "push" label set if the PR was > not submitted by a maintainer in the first place" > >> > >> For maintainer identification process, where does > the mergify bot get the maintainer list from? > > > > I *think* it is represented through membership in the > "tianocore" > > organization on github.com. > > > > https://github.com/orgs/tianocore/people > > > > I'm not sure but I imagine different people could > have different > > permissions associated with them, in this org. > > Seems like there is a subgroup (?) called > "tianocore/edk-ii-maintainers". > > Thanks > Laszlo > > >> Do you know who should I ask to be added to that > list? > > > > If I remember correctly, Mike can manage such > memberships / rights. > > > > Thanks! > > Laszlo > > > > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 18:27 ` Michael D Kinney @ 2019-12-10 22:05 ` Rabeda, Maciej 0 siblings, 0 replies; 12+ messages in thread From: Rabeda, Maciej @ 2019-12-10 22:05 UTC (permalink / raw) To: Kinney, Michael D, devel@edk2.groups.io, lersek@redhat.com, Wu, Jiaxin, Maciej Rabeda, Gao, Liming Cc: Fu, Siyuan Mike, Laszlo, Jiaxin, I think everything is clear now, thanks for explanations! I will produce a v2 of the patch with updated email address and role. We'll keep 2 maintainers for NetworkPkg for the time being. Thanks! Maciej -----Original Message----- From: Kinney, Michael D <michael.d.kinney@intel.com> Sent: Tuesday, December 10, 2019 19:28 To: devel@edk2.groups.io; lersek@redhat.com; Rabeda, Maciej <maciej.rabeda@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>; Maciej Rabeda <maciej.rabeda@linux.intel.com>; Gao, Liming <liming.gao@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com> Cc: Fu, Siyuan <siyuan.fu@intel.com> Subject: RE: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address Hi Maciej, Once a patch review is complete that updates Maintainers.txt with a new maintainer, one of the existing maintainers should submit a PR to get Maintainer.txt updated in edk2/master. In the corner case where none of the existing maintainers are available to submit this PR, one of the stewards can support this PR. At that point, the new maintainer needs to be added to the TianoCore EDK II Maintainers Team so the new maintainer has The ability to set the 'push' label on PRs they want merged into edk2/master. The new maintainer should send an email to the mailing list requesting membership in the TianoCore EDK II Maintainers team. Thanks, Mike > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Laszlo > Ersek > Sent: Tuesday, December 10, 2019 10:17 AM > To: Rabeda, Maciej <maciej.rabeda@intel.com>; devel@edk2.groups.io; > Wu, Jiaxin <jiaxin.wu@intel.com>; Maciej Rabeda > <maciej.rabeda@linux.intel.com>; Kinney, Michael D > <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com> > Cc: Fu, Siyuan <siyuan.fu@intel.com> > Subject: Re: [edk2-devel] [PATCH] Maintainers.txt: > Update reviewer email address > > On 12/10/19 19:15, Laszlo Ersek wrote: > > On 12/10/19 16:01, Rabeda, Maciej wrote: > >> Laszlo, > >> > >> Thanks for a thorough explanation of the process :) It looks like > >> one extra step for maintainership > transition seems is identified: > >> "However (AIUI), the mergify bot will reject and > close any PR with the "push" label set if the PR was not submitted by > a maintainer in the first place" > >> > >> For maintainer identification process, where does > the mergify bot get the maintainer list from? > > > > I *think* it is represented through membership in the > "tianocore" > > organization on github.com. > > > > https://github.com/orgs/tianocore/people > > > > I'm not sure but I imagine different people could > have different > > permissions associated with them, in this org. > > Seems like there is a subgroup (?) called > "tianocore/edk-ii-maintainers". > > Thanks > Laszlo > > >> Do you know who should I ask to be added to that > list? > > > > If I remember correctly, Mike can manage such > memberships / rights. > > > > Thanks! > > Laszlo > > > > > -------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [edk2-devel] [PATCH] Maintainers.txt: Update reviewer email address 2019-12-10 9:10 ` Laszlo Ersek 2019-12-10 9:32 ` Rabeda, Maciej @ 2019-12-10 10:27 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 12+ messages in thread From: Philippe Mathieu-Daudé @ 2019-12-10 10:27 UTC (permalink / raw) To: devel, lersek, Rabeda, Maciej, Wu, Jiaxin, Maciej Rabeda, Kinney, Michael D, Gao, Liming Cc: Fu, Siyuan On 12/10/19 10:10 AM, Laszlo Ersek wrote: > On 12/10/19 09:35, Rabeda, Maciej wrote: >> Ok, Jiaxin :) >> >> Mike, Laszlo, Liming, >> >> Do you know who I should contact in regards to maintainership role >> transition (edk2 write access etc.)? > > Write access directly to the edk2 repo has been revoked from > maintainers. > > Documentation updates are underway by Mike, to my understanding. Please > see the following threads: > > - [edk2-devel] EDK II Maintainers - EDK II CI is now active on edk2/master > http://mid.mail-archive.com/E92EE9817A31E24EB0585FDF735412F5B9E173A1@ORSMSX113.amr.corp.intel.com > https://edk2.groups.io/g/devel/message/50407 > > - [edk2-devel] [Patch wiki v2] EDK II CI: Update Phase 1 details and admin settings > http://mid.mail-archive.com/20191202175630.12788-1-michael.d.kinney@intel.com > https://edk2.groups.io/g/devel/message/51556 > > - [edk2-devel] [Patch wiki v2] EDK II Dev Process: Change push to GitHub pull request > http://mid.mail-archive.com/20191202180131.876-1-michael.d.kinney@intel.com > https://edk2.groups.io/g/devel/message/51557 > > > For a brief (personal, informal) summary, I can offer (quoting an email > I sent earlier): > > - prepare a local topic branch, on top of master, with the review tags > in place, such that (per the earlier method) you'd ff-push that topic > branch as the new edk2 master. > > - instead of pushing it to edk2, push it to your personal edk2 repo on > github.com > > - log in to github.com, and initiate a pull request against edk2/master, > from your personal topic branch You should be able to work without browser, using the hub tool such: $ sudo dnf install hub $ hub pull-request \ --base tianocore:master \ --head lersek:next \ --edit \ -F - < pull-request-template.md (see https://hub.github.com/hub-pull-request.1.html) I haven't audited the tool, so if you are worried about using it on your workstation, the web interface is certainly safer :) There is a Docker image based on Debian: https://hub.docker.com/r/tianon/github-hub/dockerfile $ podman pull tianon/github-hub ~/source/edk2$ podman run -v $PWD:$PWD -w $PWD tianon/github-hub usage: git [--version] [--help] [-C <path>] [-c name=value] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path] [-p | --paginate | --no-pager] [--no-replace-objects] [--bare] [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>] <command> [<args>] However it seems still incomplete: ~/source/edk2$ docker run \ --rm \ --volume $PWD:$PWD \ --volume $HOME/.gitconfig:$HOME/.gitconfig:ro \ --volume $HOME/.config/edk2:$HOME/.config/edk2:ro \ --volume $HOME/.config:/config:ro \ --workdir $PWD \ --user $UID \ tianon/github-hub \ hub issue mkdir /.config: permission denied So apparently this expects root privileges within container meaning it will access host files with that privileges too, which I'm not ready to accept. > - as soon as the pull request has been filed, locate the "labels" box to > the right, and apply the "push" label. > > Once the CI tests complete, the branch will be merged (fast-forwarded). > > > The official description will be in the wiki, containing even > screenshots. See the third reference above, from Mike. For now, those > updates can be seen rendered in Mike's clone of the Wiki, namely at > <https://github.com/mdkinney/edk2/wiki/EDK-II-Development-Process>. > > Thanks > Laszlo ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-12-10 22:05 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-12-06 16:28 [PATCH] Maintainers.txt: Update reviewer email address Maciej Rabeda 2019-12-10 5:37 ` Wu, Jiaxin 2019-12-10 8:35 ` [edk2-devel] " Rabeda, Maciej 2019-12-10 9:10 ` Laszlo Ersek 2019-12-10 9:32 ` Rabeda, Maciej 2019-12-10 12:36 ` Laszlo Ersek 2019-12-10 15:01 ` Rabeda, Maciej 2019-12-10 18:15 ` Laszlo Ersek 2019-12-10 18:16 ` Laszlo Ersek 2019-12-10 18:27 ` Michael D Kinney 2019-12-10 22:05 ` Rabeda, Maciej 2019-12-10 10:27 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox