Re: Pushing to site (in svn)

2019-02-11 Thread Michael Mior
Just to clarify that it is *intentional* that master and site are not in sync. For example, the Javadoc should refer to the currently published version of Calcite, not whatever is currently in progress. Also, any documentation on new features or changes should only appear when those are released,

Re: Pushing to site (in svn)

2019-02-10 Thread Andrei Sereda
Yes static site is tricky. You have to keep 3 branches in sync: master, site and svn. I always publish from site branch (and have fewer diffs). Sometimes git master and site branches are only synced during release. On Sun, Feb 10, 2019 at 9:17 AM Stamatis Zampetakis wrote: > @Francis:

Re: Pushing to site (in svn)

2019-02-10 Thread Stamatis Zampetakis
@Francis: Whatever I said concerns the site branch (not the master). @Andrei: I did more or less the same thing but without using docker. It appears that the site branch in git and the published site in svn are not sync. Compare for instance:

Re: Pushing to site (in svn)

2019-02-09 Thread Andrei Sereda
Try first svn checkout then build site: $ rm -rf target $ svn co https://svn.apache.org/repos/asf/calcite/site target $ docker-compose run build-site $ cd target && svn status On Sat, Feb 9, 2019 at 9:43 PM Francis Chuang wrote: > Hey Stamatis, > > Are you trying to publish using the site

Re: Pushing to site (in svn)

2019-02-09 Thread Francis Chuang
Hey Stamatis, Are you trying to publish using the site branch? When publishing the site for anything other than a release, the site branch should be used. If you're using the master branch, it's possible there are some documentation for a future release that should not be published. Also,

Re: Pushing to site (in svn)

2019-02-09 Thread Stamatis Zampetakis
It is not copyrights or headers. I get various different things. For instance the following: >svn diff docs/index.html Index: docs/index.html === --- docs/index.html (revision 1853282) +++ docs/index.html (working copy) @@ -152,7

Re: Pushing to site (in svn)

2019-02-09 Thread Andrei Sereda
What are the differences ? Is it just copyright year / header ? On Sat, Feb 9, 2019 at 10:08 AM Stamatis Zampetakis wrote: > Hello, > > I did a git checkout of the site branch and then bundle exec jekyll build. > > When I compare the output with the current version of the site in svn I see >

Pushing to site (in svn)

2019-02-09 Thread Stamatis Zampetakis
Hello, I did a git checkout of the site branch and then bundle exec jekyll build. When I compare the output with the current version of the site in svn I see lots of modifications (below the output of svn status in target directory). I was wondering if this is normal (given that I didn't modify