Re: [orion-dev] Process for converging on stable/release builds

[Paul Webster <pwebster@xxxxxxxxxxxxxxxxxxx>]

On Thu, Jul 17, 2014 at 1:43 PM, John Arthorne <John_Arthorne@xxxxxxxxxx> wrote:

During Orion 7.0 we have completely stopped doing milestones in favour of a more continuous delivery model. We would like to produce regular (roughly weekly) stable builds that can be deployed to orionhub.org. One issue with this is how to stabilize the code for a stable build without disrupting ongoing development in master. After discussing ideas with various committers I would like to propose a process of branching once per week at a predictable time, and use that to converge on a stable build while allowing master branch to continue development.

https://wiki.eclipse.org/Orion/Continuous_Delivery#Stable_build_process

I have some questions:  What do you mean when you want to review commits into the new stable branch?  Merge them over?  Or cherry-pick them?

I have a suggestion:  Each week make your branch (stable_70_S2 to match how your build is named?) off of master.  Then you can pull in new fixes you need to stabilize the stable build simultaneously in master and stable_*.

Also, I believe your most common case will be including all of master, with the occasional exception.  In that exception case, probably better to do a revert of the questionable commit in the stable_* branch than be forced to cherry-pick over most fixes that are fine.

Later,
Paul

--

Hi floor.  Make me a sammich! - GIR