Re: [OMPI devel] Sample of merging ompi and ompi-release
Ralph, On the ompi-release repo, developers with no write permissions (e.g. all but RM, GK and admin) cannot set label nor milestone nor assign PR. The bot was a creative way to work around this limitation. IIRC, the bot does not accept instructions from non Open MPI developers. The new "review" feature can be a replacement of the bot interpreting thumbs up/down. I had no time me to check the unified repo, so I did not check who can set label/milestone/assignment and review PR vs the release branches. If developer can do that, then the bot is no more necessary. That being said, I am happy to keep help maintaining it for those, including myself, that are more comfortable with typing text rather than clicking a web interface. Cheers, Gilles On Tuesday, September 20, 2016, r...@open-mpi.org wrote: > One question, to be discussed on the webex: now that github has a > “reviewed” feature, so we still need/want the “thumbs-up” bot? If we retain > it, then how do we deal with the non-sync’d, duplicative mechanisms? > > > On Sep 19, 2016, at 4:23 PM, George Bosilca > wrote: > > :+1: > > George. > > > On Mon, Sep 19, 2016 at 6:56 PM, Jeff Squyres (jsquyres) < > jsquy...@cisco.com > > wrote: > >> (we can discuss all of this on the Webex tomorrow) >> >> Here's a sample repo where I merged ompi and ompi-release: >> >> https://github.com/open-mpi/ompi-all-the-branches >> >> Please compare it to: >> >> https://github.com/open-mpi/ompi >> and https://github.com/open-mpi/ompi-release >> >> It's current to as of within the last hour or so. >> >> Feel free to make dummy commits / pull requests on this rep. It's a >> sandbox repo that will eventually be deleted; it's safe to make whatever >> changes you want on this repo. >> >> Notes: >> >> - All current OMPI developers have been given the same push/merge access >> on master >> - Force pushes are disabled on *all* branches >> - On release branches: >> - Pull requests cannot be merged without at least 1 review >> *** ^^^ This is a new Github feature >> - Only the gatekeeper team can merge PRs >> >> If no one sees any problem with this sandbox repo, I can merge all the >> ompi-release branches to the ompi repo as soon as tomorrow, and config the >> same settings. >> >> -- >> Jeff Squyres >> jsquy...@cisco.com >> For corporate legal information go to: http://www.cisco.com/web/about >> /doing_business/legal/cri/ >> >> ___ >> devel mailing list >> devel@lists.open-mpi.org >> >> https://rfd.newmexicoconsortium.org/mailman/listinfo/devel >> > > ___ > devel mailing list > devel@lists.open-mpi.org > > https://rfd.newmexicoconsortium.org/mailman/listinfo/devel > > > ___ devel mailing list devel@lists.open-mpi.org https://rfd.newmexicoconsortium.org/mailman/listinfo/devel
Re: [OMPI devel] Sample of merging ompi and ompi-release
We talked about this on the call today. SHORT VERSION = I'll merge ompi and ompi-release in the very near future (next 48 hours). Any PRs still open on the ompi-release repo will need to be re-opened on the ompi repo by their respective authors. MORE DETAIL === The ompi-all-branches repo seems to have all the functionality that we want (we tried it out with a few PRs today): - Anyone can PR on master and merge when they want to - Anyone can PR on release branches, and set labels, milestones, and assign - Anyone can review any PR. Reviews are *required* on release branches (but not master) - When you review, you can approve the PR or request changes - Requesting changes blocks PRs on release branches - Requesting changes will NOT block PRs on master As a result, there does not seem to be a need for the ompi-release-bot any more. Specifically: code reviews will use the Github mechanism to approve a PR or request changes. The "reviewed" and "pushed-backed" labels will now become moot on the release branches. They might still be useful on master...? We'll see how this plays out. *** To be 100% clear: adding a ":+1:" or ":-1:" in a comment is no longer sufficient. We have always required code reviews on release branches; Github now gives us technology to enforce that requirement. Everyone seems cool with this. Therefore, the plan moving forward will be: 1. merge all the branches and tags of ompi-release into ompi 2. set the code review / writability options on ompi repo just like they are on the sandbox ompi-all-the-branches repo 3. delete the ompi-all-the-branches sandbox repo 4. I will "git rm -r *" on all release branches in ompi-release, and leave a short README.md explaining that everything has moved back to ompi 5. the ompi-release repo will be kept around so that we have a history of all the PRs that have occurred there (and links won't be broken) 6. any open PRs on ompi-release will be closed without merging (they'll become invalid at step #4, anyway). 7. authors of such closed-and-not-merged ompi-release PRs will need to re-open the PRs on the ompi repo if they still want them to go into the release branches. We highly suggest including a link to the prior PR (i.e., the one on the ompi-release repo) to point to old conversations/comments/etc. > On Sep 20, 2016, at 7:01 AM, Gilles Gouaillardet > wrote: > > Ralph, > > On the ompi-release repo, developers with no write permissions (e.g. all but > RM, GK and admin) cannot set label nor milestone nor assign PR. The bot was a > creative way to work around this limitation. > IIRC, the bot does not accept instructions from non Open MPI developers. > > The new "review" feature can be a replacement of the bot interpreting thumbs > up/down. > > I had no time me to check the unified repo, so I did not check who can set > label/milestone/assignment and review PR vs the release branches. > If developer can do that, then the bot is no more necessary. > That being said, I am happy to keep help maintaining it for those, including > myself, that are more comfortable with typing text rather than clicking a web > interface. > > Cheers, > > Gilles > > On Tuesday, September 20, 2016, r...@open-mpi.org wrote: > One question, to be discussed on the webex: now that github has a “reviewed” > feature, so we still need/want the “thumbs-up” bot? If we retain it, then how > do we deal with the non-sync’d, duplicative mechanisms? > > >> On Sep 19, 2016, at 4:23 PM, George Bosilca wrote: >> >> :+1: >> >> George. >> >> >> On Mon, Sep 19, 2016 at 6:56 PM, Jeff Squyres (jsquyres) >> wrote: >> (we can discuss all of this on the Webex tomorrow) >> >> Here's a sample repo where I merged ompi and ompi-release: >> >> https://github.com/open-mpi/ompi-all-the-branches >> >> Please compare it to: >> >> https://github.com/open-mpi/ompi >> and https://github.com/open-mpi/ompi-release >> >> It's current to as of within the last hour or so. >> >> Feel free to make dummy commits / pull requests on this rep. It's a sandbox >> repo that will eventually be deleted; it's safe to make whatever changes you >> want on this repo. >> >> Notes: >> >> - All current OMPI developers have been given the same push/merge access on >> master >> - Force pushes are disabled on *all* branches >> - On release branches: >> - Pull requests cannot be merged without at least 1 review >> *** ^^^ This is a new Github feature >> - Only the gatekeeper team can merge PRs >> >> If no one sees any problem with this sandbox repo, I can merge all the >> ompi-release branches to the ompi repo as soon as tomorrow, and config the >> same settings. >> >> -- >> Jeff Squyres >> jsquy...@cisco.com >> For corporate legal information go to: >> http://www.cisco.com/web/about/doing_business/legal/cri/ >> >> ___ >> devel mailing list >> devel@lists.open-mpi.org >> ht
[OMPI devel] ompi-release repo is now closed; long live the ompi repo!
All the branches from ompi-release have now been merged back into the ompi repo. (amusingly, we all got a gitdub email for the creation of each old release branch) The ompi-release repo is now effectively closed. It will not be deleted, however, so that old links won't go stale, and old conversations won't be lost. We'll shortly "git rm -rf *" in each of the branches in the ompi-release repo and leave a short README explaining that that branch has now moved to the ompi repo -- just to further accentuate that that repo is now closed / stale. There were a handful of PRs still open on the ompi-release repo: some were failing CI tests, some hadn't received reviews, etc. Authors need to open new PRs on the ompi repo to get them into release branches. I left them open so that they would be easy to find; authors: please close them when you open a new corresponding PR on the ompi repo. The ompi-all-the-branches sandbox repo has been deleted. As discussed in an email earlier today, the use of the "bot:" commands are no longer necessary. You can just directly set labels, set milestones, and assign people to pull requests on the ompi repo (even on release branches). Yay! Also, the new github "review" functionality is *required* on all PRs on release branches (but not on master). We have required reviews on release branches for a long time; Github now enforces this requirement for us. The wiki pages about making PRs (and the bot and ...) are now out of date. If someone could go update them to reflect this new arrangement, I would greatly appreciate it (I have already spent far too much time on all the infrastructure work lately) -- thank you! Long live the ompi repo! -- Jeff Squyres jsquy...@cisco.com For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/ ___ devel mailing list devel@lists.open-mpi.org https://rfd.newmexicoconsortium.org/mailman/listinfo/devel
Re: [OMPI devel] ompi-release repo is now closed; long live the ompi repo!
Jeff, in order to re-create a PR that i hope is merged before v2.0.2, what shall i do ? - one PR vs the v2.0.x branch ? - one PR vs the v2.x branch ? - two PRs vs the v2.0.x and v2.x branches ? Cheers, Gilles On 9/21/2016 10:20 AM, Jeff Squyres (jsquyres) wrote: All the branches from ompi-release have now been merged back into the ompi repo. (amusingly, we all got a gitdub email for the creation of each old release branch) The ompi-release repo is now effectively closed. It will not be deleted, however, so that old links won't go stale, and old conversations won't be lost. We'll shortly "git rm -rf *" in each of the branches in the ompi-release repo and leave a short README explaining that that branch has now moved to the ompi repo -- just to further accentuate that that repo is now closed / stale. There were a handful of PRs still open on the ompi-release repo: some were failing CI tests, some hadn't received reviews, etc. Authors need to open new PRs on the ompi repo to get them into release branches. I left them open so that they would be easy to find; authors: please close them when you open a new corresponding PR on the ompi repo. The ompi-all-the-branches sandbox repo has been deleted. As discussed in an email earlier today, the use of the "bot:" commands are no longer necessary. You can just directly set labels, set milestones, and assign people to pull requests on the ompi repo (even on release branches). Yay! Also, the new github "review" functionality is *required* on all PRs on release branches (but not on master). We have required reviews on release branches for a long time; Github now enforces this requirement for us. The wiki pages about making PRs (and the bot and ...) are now out of date. If someone could go update them to reflect this new arrangement, I would greatly appreciate it (I have already spent far too much time on all the infrastructure work lately) -- thank you! Long live the ompi repo! ___ devel mailing list devel@lists.open-mpi.org https://rfd.newmexicoconsortium.org/mailman/listinfo/devel
Re: [OMPI devel] ompi-release repo is now closed; long live the ompi repo!
On Sep 20, 2016, at 9:40 PM, Gilles Gouaillardet wrote: > > in order to re-create a PR that i hope is merged before v2.0.2, what shall i > do ? > > - one PR vs the v2.0.x branch ? > > - one PR vs the v2.x branch ? > > - two PRs vs the v2.0.x and v2.x branches ? Yes, now that we have a v2.0.x and v2.x branch, you'll need to open a PR for each of them. -- Jeff Squyres jsquy...@cisco.com For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/ ___ devel mailing list devel@lists.open-mpi.org https://rfd.newmexicoconsortium.org/mailman/listinfo/devel
