[GeoNetwork-devel] Merging pull requests checks

Hi

Please, before merging pull requests, let’s try to follow some steps:

  • Assign a milestone for the pull request.

  • If the change is relevant to be added to the release changelog, please add the label changelog.

  • If the pull request is a fix or small improvement set the label backport-4.2.x (I’ll manage periodically about this).

  • If the pull request is intended to be backported, please use the option Squash and merge, otherwise if the pull request has several commits, it becomes difficult to back port.

Thanks and regards,

Jose García

Jose Garcia

E-mail: jose.garcia@anonymised.com

https://www.geocat.net

Veenderweg 13

6721 WD Bennekom

The Netherlands

Tel: +31318416664

Hi Jose,

Excellent, thanks for the reminder.
Maybe add those recommendations somewhere in the documentation so it’s not lost, like https://github.com/geonetwork/core-geonetwork/blob/main/CONTRIBUTING.md ? Or maybe we have other places for that ?
Thanks !

···

This is Florent Gravin's card. Their email is florent.gravin@anonymised.com

Hi Florent

Sure I can add that, but also these properties can’t usually be set by contributors, unless they are also committers. It’s something we should set when reviewing pull requests.

Regards,
Jose garcía

Jose Garcia

E-mail: jose.garcia@anonymised.com

https://www.geocat.net

Veenderweg 13

6721 WD Bennekom

The Netherlands

Tel: +31318416664

---- On Mon, 09 Oct 2023 10:59:51 +0200 Florent Gravin <florent.gravin@anonymised.com…> wrote —

Hi Jose,

Excellent, thanks for the reminder.

Maybe add those recommendations somewhere in the documentation so it’s not lost, like https://github.com/geonetwork/core-geonetwork/blob/main/CONTRIBUTING.md ? Or maybe we have other places for that ?

Thanks !

On Mon, Oct 9, 2023 at 10:47 AM Jose Garcia via GeoNetwork-devel <geonetwork-devel@anonymised.comts.sourceforge.net> wrote:

Hi

Please, before merging pull requests, let’s try to follow some steps:

  • Assign a milestone for the pull request.

  • If the change is relevant to be added to the release changelog, please add the label changelog.

  • If the pull request is a fix or small improvement set the label backport-4.2.x (I’ll manage periodically about this).

  • If the pull request is intended to be backported, please use the option Squash and merge, otherwise if the pull request has several commits, it becomes difficult to back port.

Thanks and regards,

Jose García

Jose Garcia

E-mail: jose.garcia@anonymised.com

https://www.geocat.net

Veenderweg 13

6721 WD Bennekom

The Netherlands

Tel: +31318416664


GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork

Hi Olivia

I disabled merge commits for pull requests. I was not aware that it could be disabled.

About the backports, Jody indicated they use in GeoServer a GitHub action to create an automatic backport PR. But in any case will require to assign the propert labels.

Regards,

Jose García

Jose Garcia

E-mail: jose.garcia@anonymised.com

https://www.geocat.net

Veenderweg 13

6721 WD Bennekom

The Netherlands

Tel: +31318416664

---- On Mon, 09 Oct 2023 11:42:17 +0200 Olivia Guyot olivia.guyot@anonymised.com wrote —

Hi,

I know that I missed several times the necessity to do “squash and merge”, sorry for that. But wouldn’t it be simpler to just enforce it in the repository settings? This is an irreversible action and it is error-prone in my view (especially since the requested choice is not the default one).

As for backports, can’t we have a bot doing it?

camptocamp
INNOVATIVE SOLUTIONS

BY OPEN SOURCE EXPERTS

Olivia Guyot

Geospatial Developer

+49 89 2620 89 924

On Mon, Oct 9, 2023 at 11:32 AM Jose Garcia via GeoNetwork-devel <geonetwork-devel@lists.sourceforge.net> wrote:

Hi Florent

Sure I can add that, but also these properties can’t usually be set by contributors, unless they are also committers. It’s something we should set when reviewing pull requests.

Regards,
Jose garcía

Jose Garcia

E-mail: jose.garcia@anonymised.com

https://www.geocat.net

Veenderweg 13

6721 WD Bennekom

The Netherlands

Tel: +31318416664

---- On Mon, 09 Oct 2023 10:59:51 +0200 Florent Gravin <florent.gravin@anonymised.com> wrote —

Hi Jose,

Excellent, thanks for the reminder.

Maybe add those recommendations somewhere in the documentation so it’s not lost, like https://github.com/geonetwork/core-geonetwork/blob/main/CONTRIBUTING.md ? Or maybe we have other places for that ?

Thanks !

On Mon, Oct 9, 2023 at 10:47 AM Jose Garcia via GeoNetwork-devel <geonetwork-devel@lists.sourceforge.net> wrote:

Hi

Please, before merging pull requests, let’s try to follow some steps:

  • Assign a milestone for the pull request.

  • If the change is relevant to be added to the release changelog, please add the label changelog.

  • If the pull request is a fix or small improvement set the label backport-4.2.x (I’ll manage periodically about this).

  • If the pull request is intended to be backported, please use the option Squash and merge, otherwise if the pull request has several commits, it becomes difficult to back port.

Thanks and regards,

Jose García

Jose Garcia

E-mail: jose.garcia@anonymised.com

https://www.geocat.net

Veenderweg 13

6721 WD Bennekom

The Netherlands

Tel: +31318416664


GeoNetwork-devel mailing list
GeoNetwork-devel@anonymised.comourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork


GeoNetwork-devel mailing list
GeoNetwork-devel@anonymised.comge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork

There are two open pull requests on this topic:

https://github.com/geonetwork/core-geonetwork/pull/7408

  • Which includes clarifications to CONTIRBUTING.md and a PULL_REQUEST_TEMPLATE.md (to act as a reminder for those making or reviewing a pull request).

https://github.com/geonetwork/core-geonetwork/pull/7412

Background: I feel that indicating if a pull request should be noted in the change log (either by process or by git note … is hard to check). I considered recommending making the “the next” change log in the docs, and then the pull-request adding a change can include a commit updating the change-log (easy to check). But this means that the pull-request cannot be cherry-picked (and thus automatically backported by the backport bot). The use of git note attaches the “change log message” to the commit, so it would show up when generating change log on the older branch.

So use of “git note” automates Jose’s proposed workflow; with less room for manually mistake of missing something.

···

This is Florent Gravin's card. Their email is florent.gravin@anonymised.com