On Sat, Oct 14, 2017 at 5:00 PM, Jean-Baptiste Onofré <j...@nanthrax.net> wrote: > Hi > > In Karaf I configured a Jenkins build to be triggered on each PR. The results > are in the PR comments and so you can merge only if the build is green on > Jenkins. > > Maybe we can setup the same in camel ? >
I dont think so as a full build is 4+ hours. And jenkins is not smart enough to only build a sub set of a PR such as if you only change in camel-aws, then only test camel-aws etc. Also we have a bit of trouble as some of the CI servers are too limited spec'ed with memory so they can't build the project either. > Regards > JB > > On Oct 14, 2017, 14:48, at 14:48, Grzegorz Grzybek <gr.grzy...@gmail.com> > wrote: >>Hello >> >>+1 >> >>Also, when you backport (e.g., from master to 2.19.x) changes by >>cherry-pick, use: >> >>git cherry-pick -x >> >>which gives automatic reference to picked commit (SHA1) in the new >>commit >>message. >> >>regards >>Grzegorz Grzybek >> >>2017-10-14 14:28 GMT+02:00 Claus Ibsen <claus.ib...@gmail.com>: >> >>> Hi >>> >>> When you merge github PRs then its important to merge and rebuild on >>> top afterwards so we have a straight git tree. >>> >>> So after you have done the merge, then you SHOULD run >>> >>> git pull --rebase >>> >>> Then it replay the merge on top of latest master. And if there is any >>> conflicts you need to fix them, so we can merge any PR cleanly on >>> latest master. >>> >>> Otherwise we end up with a more complex git tree that makes it harder >>> to maintain and also backport bug fixes to older branches. >>> >>> Also refrain from backporting trivil javadoc changes and others to >>> older branches. The older branches are intended to be "quiet" and for >>> bug fixes and minor needed improvements only. The less changes we >>have >>> one these the better for the end users as they are are for patch >>> releases for production users. >>> >>> >>> >>> -- >>> Claus Ibsen >>> ----------------- >>> http://davsclaus.com @davsclaus >>> Camel in Action 2: https://www.manning.com/ibsen2 >>> -- Claus Ibsen ----------------- http://davsclaus.com @davsclaus Camel in Action 2: https://www.manning.com/ibsen2
