[mapserver-dev] Time for a 7.2.2 release?

[Lime, Steve D (MNIT)]

This is definitely a process that we want to run on a continuous basis. There haven't been commits to branches older than 7.2 so that branch should be ok for release. It's a bigger issue for master. I guess the question is should devs always run through Even's process with commits to stable release branches or is this something someone could be responsible for doing on a regular basis (weekly?). Not sure what other projects do. I think we want a single commit and then merge(s). Thoughts?

--Steve

-----Original Message-----
From: Even Rouault [mailto:even.rouault at spatialys.com] 
Sent: Thursday, February 07, 2019 3:18 AM
To: mapserver-dev at lists.osgeo.org
Cc: Seth G <sethg at geographika.co.uk>; Lime, Steve D (MNIT) <steve.lime at state.mn.us>
Subject: Re: [mapserver-dev] Time for a 7.2.2 release?

On mercredi 6 février 2019 23:40:45 CET Seth G wrote:
> Hi Steve,
> 
> +1 on a 7.2.2 release. Most of the MapScript changes are in master as
> they change existing functionality/build process so are more suited to
> the planned 7.4 release.
> I have a question on the release process. The link in the wiki [1]
> refers to the using the stablemerge.sh script (which is currently out
> of date), but its purpose was to ensure any fixes to the release
> branch (e.g. 7.2) were applied to master. I think a few commits may
> have initially been lost/not propogated to master following the 7.2
> release [3].I see some devs commit a fix to the branch release and also
> master [4]. Is this the recommended approach, or is this taken care of in
> the
> release process?

I've never used the stablemerge.sh script, but I essentially do manually what 
it does:

- git commit in the stable branch
- git push
- git checkout master
- git pull
- git merge origin/release-7-2
- solve conflicts
- git push

Even

-- 
Spatialys - Geospatial professional services
https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.spatialys.com&data=02%7C01%7Csteve.lime%40state.mn.us%7Ceb69f402fb7147db191a08d68cdd3401%7Ceb14b04624c445198f26b89c2159828c%7C0%7C1%7C636851279033212926&sdata=84JfsR0iT389AcINM7GfWJF%2BASNUci%2FQ1CtPNoQaZVg%3D&reserved=0