[mapserver-dev] MapServer docs and GitHub Process

[Seth G]

Hi,

Thanks for the merge. 

It looks like the backport bot was already setup on docs 6 months ago [1], so any change comes down to updating the "About" text and default branch. 

Re line endings - I've been guilty of this, especially when EOL differences are hidden by default in diff viewers. 
Currently, it seems the docs are majority CRLF and the MapServer code are majority LF. 
Trying to enforce this via .gitattributes didn't work out too well last time [2]. 
Maybe there is a GitHub Action that could help [3]. 

Seth

[1] https://github.com/mapserver/docs/blob/master/.github/workflows/backport.yml
[2] https://github.com/mapserver/mapserver/pull/5934
[3] https://github.com/marketplace/actions/check-crlf

Options to enforce this on pull requests would be very useful. 

--
web:http://geographika.co.uk
twitter: @geographika


On Sun, Sep 20, 2020, at 11:18 AM, Even Rouault wrote:
> Hi,

>  

> I'm OK with that. I've just done the exercise of merging the 7.6 branch to master. Technically this is just a matter of running "git merge", but there are indeed the issues with conflicts. There were a few here to solve.

>  

> One issue that we face regularly though to keep the stable and master branch in sync is the issue of line endings. This is something we face independently of using "git merge" or backport/cherry-picking of commits. Would be good if people could convince their text editors not to alter the line endings. Or we might play with .git/config settings to decide for a given line ending on the server.

>  

> Once we go for a backport-based workflow, git merge will no longer be usable, so this will require discipline for people to make sure that whatever must be ported to the other branch is done at the time the change is pushed.

>  

> Even

>  

> > Hi all,

> >

> > At the moment pull requests to https://github.com/mapserver/docs/ should be

> > made to the latest active branch (currently 7.6). Documentation for new

> > features however should be made to master (as they won't apply to new

> > features). Sometimes it is difficult to know if a code change will be

> > backported or not.

> >

> > There are several pull requests that have been added to the 7.6 branch that

> > are not in master, and some in master that are not in 7.6. I'm not sure how

> > these possible conflicts are merged following a release (likely a

> > painstaking manual process by Jeff?).

> >

> > Would it make sense to follow the same development process as the MapServer

> > codebase, and set up the GitHub "backport" bot? Then if code is backported

> > the doc pull request can be too, and master will contain all updates.

> >

> > Seth

> >

> >

> > --

> > web:http://geographika.co.uk

> > twitter: @geographika

> > _______________________________________________

> > mapserver-dev mailing list

> > mapserver-dev at lists.osgeo.org

> > https://lists.osgeo.org/mailman/listinfo/mapserver-dev

>  

>  

> --

> Spatialys - Geospatial professional services

> http://www.spatialys.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/mapserver-dev/attachments/20200920/ce97bc5e/attachment-0001.html>