On 28 April 2018 at 12:37, Hervé BOUTEMY <[email protected]> wrote: > Le samedi 28 avril 2018, 13:17:03 CEST sebb a écrit : >> On 28 April 2018 at 11:52, Hervé BOUTEMY <[email protected]> wrote: >> > ok for me >> > >> > IIUC, the Buildbot configuration that Sebb started can work from Git >> > source as well as from svn: that's great >> > >> > one thing that we should do IMHO would be to better separate source from >> > generated output: only source should go to Git, and generated html should >> > be elsewhere >> >> Generated site must be in Git or SVN > yes, sure > I was just meaning that having a very clear separation of the locations of > sources vs generated content would help understanding, then migrating. > > In Git, this would naturally be in a separate branch named "asf-site"
The build will then need to manage two repos: The source repo and the pubsub repo, but I guess that is do-able But it's simpler to stay with a single repo. > In svn, this is probably too late to change locations now, but we'll need to > have /docs / content to be fully generated from /xdocs/: I'll copy > /docs/flagged to /xdocs/flagged and we'll have the expected situation (I > checked, the current build.sh does copy content) +1; this has been said by others >> >> > this means that docs/flagged content, which is currently added directly in >> > docs directory should simply be copied to xdocs and edited from there: >> > the build.sh copies the content to docs, then the result will be the >> > same. This will just give cleaner separation between source and generated >> > spaces >> >> Agreed that editable source should go in one directory and generated >> stuff in another. >> >> However I disagree that docs should not be in Git as impled above. > If we switch sources to Git, we still have the choice to switch generated > content to Git (as asf-site branch in the same repo and GitPubSub/wcsub [2]) > or stay with svn just for generated content: any of the options will work, > it's just a matter of choice and common understanding (common understanding > being IMHO the most important given Attic PMC is really very diverse in > technical culture) > > Regards, > > Hervé > > [2] > https://github.com/apache/infrastructure-puppet/blob/deployment/modules/gitwcsub/files/config/gitwcsub.cfg > >> >> > Regards, >> > >> > Hervé >> > >> > Le jeudi 26 avril 2018, 08:28:58 CEST Jan Iversen a écrit : >> >> Hi >> >> >> >> Any objections against moving attic to git ? >> >> >> >> using github enables online file editing/committing, and thus removes the >> >> need for terminal access. >> >> >> >> I have not found similar possibilities with svn. >> >> >> >> I will let this be open until 2 may, and then continue of course unless >> >> we >> >> have an open discussion. >> >> >> >> rgds >> >> jan i >> >> Sent from my iPad > >
