It looks like the "master" branch has not been updated for a long time. Do we manually merge "staging" changes into "master"? How often?
If we don't have an automated presubmit queue (that does automated testing against the new changes and merge them to "master" if tests pass) yet, I don't see any meaning of having "staging" branch. These days I feel that changes are sitting in "staging" for too long time. That's inconvenient, especially because we're in early stage of development and Akaros is not being used in mission critical products yet (Later, we need to cut release branches or tag release commits from "master", I guess). Until an automated presubmit queue is established, why don't we just automatically merge "staging" changes to "master", as soon as the changes are merged to "staging"? That may break "master" from time to time, but that will happen anyway without automated process. Actually, wasn't the master branch broken for a long time recently? (I guess the fix might have been delayed because the fixing patch was sitting in "staging"). On Wed, Nov 4, 2015 at 10:58 AM, Barret Rhoden <[email protected]> wrote: > On 2015-11-02 at 20:57 Kevin Klues <[email protected]> wrote: > > The way I understood it is that "staging" is just a stepping stone to > > "master". When you submit a CL it will first be merged to staging > > before making it into master. The ultimate plan is to run some sort > > of CI (e.g. jenkins) over the staging branch, and only if all tests > > pass will the commits that differ between staging and master be merged > > back to master. I think for now, Barret is just letting things sit on > > staging for a day or two and hoping that people play around with it > > enough to weed out any obvious bugs. > > Yeah. By letting things sit on staging, this gives people the > opportunity to find bugs, whether it's from a jenkins job or some other > source. > > Barret > > -- > You received this message because you are subscribed to the Google Groups > "Akaros" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
