| Thread Previous • Date Previous • Date Next • Thread Next |
[..] with master-develop approach. [..] you really need to know, why do you need it.
Thanks for feedback Anton, that's my point :-)Considering that a develop->master step still needs to be clarified, with different opinions at the moment between Bruno (below) and Janek (07/01/2019 à 17:31 email) --- which is normal in a discussion phase ---
, considering a third experimental branch appears in the discussion , plus the branchs for each dev,let's maybe try to avoid switching from only one branch to more than three ?...
Thanks for your motivation ! Jérôme ------ Chargé de Recherche / Research Associate Irstea, RECOVER 3275 route Cezanne – CS 40061 13182 Aix-en-Provence Cedex 5 FRANCE +33 (0)4 42 66 99 21 On 07/01/2019 20:36, Anton Gladky wrote:
Hello all, last several years I did Yade releases and the process was the following. Before the release was done I created the corresponding release-branch (for example 0.60 [1]) and just tagged the new Yade version there. It worked relatively good. --------------------------------------> develop \ \ \ \ \Release 1 \Release 2 \Release 1.1 I can remember only a couple of times, where the hot-fixes were needed to be integrated into the release-branch due to some serious stability or functionality issues. Last years I have an experience of work with master-develop approach. It is not bad. But you really need to know, why do you need it. I am fully support the feature-branch + merge request way of working. It can really help to double check the code and implement some additional tests. [1] https://github.com/yade/trunk/tree/0.60 My 2cts.... Regards Anton Am Mo., 7. Jan. 2019 um 17:39 Uhr schrieb Janek Kozicki <janek_listy@xxxxx>:Bruno Chareyre said: (by the date of Mon, 7 Jan 2019 16:59:53 +0100)Daily builds would be based on the develop branch.good, that answer my question from other mail.(by the way, with a tighter control on development, would we still need a distinction between "yade" and "yadedaily" packages ?..)Yade is stable release, not updated very often, included in main debian/ubuntu repos. Yadedaily is updated more than daily, after each change to the source code, not included in debian/ubuntu repos. They are very different things and I think we need both.agreed.Also, with "develop" and "master", I guess any proposal for code modification would have to be closely examined and validated twice : - once to make it into "develop" - and once, to make it from "develop" into "master" ?...There is no reason to check the develop->master merge if everything in develop is already validated by regtests + human review. Our github/master corresponds to "develop" more or less. Merging develop into master in the new model would correspond to Anton calling for update and releasing 2018.b. More or less.agred.We probably need a liberal, truly unstable repo on the top of this, at least in a transitory phase, so that everyone can play with gitlab a bit and break everything with no limit. For instance to compare --no-ff, --only-ff, and other variants.how about calling it experimental ? :-)) And yes, we definitely need something like that. Where git reset --hard is nothing to be afraid of. -- Janek Kozicki _______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : yade-dev@xxxxxxxxxxxxxxxxxxx Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : yade-dev@xxxxxxxxxxxxxxxxxxx Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
| Thread Previous • Date Previous • Date Next • Thread Next |
