re: reverting master, shit. I forgot that the website is not on `asf-site` anymore. Well we could just re-jigger it, and check out `website` from features/multi-artifact-build-MAHOUT-20xx after we revert the rest of master.
You're right, Trevor- I 'm just going through the commits, and there are things like https://github.com/apache/mahout/commit/c17bee3c2705495b638d81ae2ad374bf7494c3f3 [https://avatars3.githubusercontent.com/u/5852441?s=200&v=4]<https://github.com/apache/mahout/commit/c17bee3c2705495b638d81ae2ad374bf7494c3f3> MAHOUT-1988 Make Native Solvers Scala 2.11 Complient closes apache/ma… · apache/mahout@c17bee3<https://github.com/apache/mahout/commit/c17bee3c2705495b638d81ae2ad374bf7494c3f3> github.com …hout#326 (make Native Solvers Scala 2.11 compliant) and others peppered in, Post 0.13.0. It still may be possible and not that hard, to cherrypick everything after 0.13.0 that we want. But I see what you're saying about it not being completely simple. As for Git-Flow. I dont really care. I use it in some projects and in others i use GitHub-flow. (basically what we've been doing with merging everything to master). Though this exact problem that we have right now is why git-flow is nice. Lets separate the question of how we go forward, with what commit/repo style, and First figure out how to back out what we have now, without loosing all of the work that you did on the multi artifact build. What do you think about reverting to 0.13.0, and cherry picking commits like Sparse Speedup: https://github.com/apache/mahout/commit/800a9ed6d7e015aa82b9eb7624bb441b71a8f397 or checking out entire folders like `website`? [https://avatars3.githubusercontent.com/u/326731?s=200&v=4]<https://github.com/apache/mahout/commit/800a9ed6d7e015aa82b9eb7624bb441b71a8f397> MAHOUT-2019 SparkRow Matrix Speedup and fixing change to scala 2.11 m… · apache/mahout@800a9ed<https://github.com/apache/mahout/commit/800a9ed6d7e015aa82b9eb7624bb441b71a8f397> github.com …ade by build script ________________________________ From: Trevor Grant <trevor.d.gr...@gmail.com> Sent: Friday, March 2, 2018 3:58:07 PM To: Mahout Dev List Subject: Re: Spark 2.x/scala 2.11.x release If you revert master to the release tag you're going to destroy the website. The website pulls and rebuilds from mater whenever Jenkins detects a change. mahout-0.13.0 has no website. So it will pull nothing and there will be no site. tg On Fri, Mar 2, 2018 at 1:24 PM, Andrew Palumbo <ap....@outlook.com> wrote: > > Sounds Good. I'll put out a proposal for the release, and we can go Over > it and vote if we want to on releasing or on the scope. I'm +1 on it. > > > Broad strokes of what I'm thinking: > > > - Checkout a new branch "features/multi-artifact-build-22xx" from master > @ the `mahout-0.13.0` release tag. > > > - Revert master back to release tag. > > > - Checkout a new `develop` branch from master @the `mahout-0.13.0` release > tag. > > > - Cherrypick any commits that we'd like to release (E.g.: SparseSpeedup) > onto `develop` (along with a PR ad a ticket). > > > - Merge `develop` to `master`, run through Smoke tests, tag master @ > `mahout-0.13.1`(automatically), and release. > > > This will also get us to more of a git-flow workflow, as we've discussed > moving towards. > > > Thoughts @all? > > > --andy > > > > > > > ________________________________ > From: Pat Ferrel <pat.fer...@gmail.com> > Sent: Wednesday, February 28, 2018 2:53:58 PM > To: Andrew Palumbo; dev@mahout.apache.org > Subject: Re: Spark 2.x/scala 2.11.x release > > big +1 > > If you are planning to branch off the 0.13.0 tag let me know, I have a > speedup that is in my scala 2.11 fork of 0.13.0 that needs to be released > > > From: Andrew Palumbo <ap....@outlook.com><mailto:ap....@outlook.com> > Reply: dev@mahout.apache.org<mailto:dev@mahout.apache.org> < > dev@mahout.apache.org><mailto:dev@mahout.apache.org> > Date: February 28, 2018 at 11:16:12 AM > To: dev@mahout.apache.org<mailto:dev@mahout.apache.org> < > dev@mahout.apache.org><mailto:dev@mahout.apache.org> > Subject: Spark 2.x/scala 2.11.x release > > After some offline discussion regarding people's needs for Spark and 2.x > and Scala 2.11.x, I am wondering If we should just consider a release for > 2.x and 2.11.x as the default. We could release from the current master, or > branch back off of the 0.13.0 tag, and release that with the upgraded > defaults, and branch our current multi-artifact build off as a feature. Any > thoughts on this? > > > --andy >
