You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2019/10/02 13:27:19 UTC
[activemq-website] branch master updated (75d6f7d -> 38362cf)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.
from 75d6f7d fixing links on 2.10.1 release notes
new ff6dec7 Adding upstream checkout on build.sh
new 38362cf Fixing past release links and download date
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.sh | 6 +++++-
src/components/artemis/download/index.md | 2 +-
src/components/artemis/download/past_releases.md | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
>
> Messing with the remotes and resetting branches in the build script
> feels a bit icky.
That's the way it is anyway, we always build everything from master.
The reason I did that was because at some point I built, and had to
rebuild because upstream had already moved on. If you really care we
can revert the change.
I think it would be better to keep the history from master any
direction we choose.
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
My intent was to test everything before checkout as asf-site and push -f
I wanted to have other people reviewing before we push.
On Wed, Oct 2, 2019 at 5:53 PM Clebert Suconic
<cl...@gmail.com> wrote:
>
> I have a branch where I'm using a single branch:
>
> https://github.com/clebertsuconic/activemq-website/tree/test
>
>
> The only concern I have so far is that any time I build, I get a
> change into a schema:
>
> Changes not staged for commit:
> (use "git add <file>..." to update what will be committed)
> (use "git checkout -- <file>..." to discard changes in working directory)
>
> typechange: content/schema/core/activemq-core.xsd
>
>
>
> Although I would consider that anyone would check stuff before committing..
>
> Any ideas?
>
> On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <jb...@apache.org> wrote:
> >
> > If it's simpler and documented that sounds like a win to me.
> >
> >
> > Justin
> >
> > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <ro...@gmail.com>
> > wrote:
> >
> > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <cl...@gmail.com>
> > > wrote:
> > > >
> > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <ro...@gmail.com>
> > > wrote:
> > > > > Thats what we do at Qpid and what I've seen other
> > > > > projects do, I find it simpler overall.
> > > >
> > > > Tl;DR:
> > > > I'm all +10000000 on this... what we need to change on infra.
> > > >
> > > > Can we keep the history from master
> > >
> > >
> > > We wouldnt need to change much to get everything on the same branch I
> > > dont think, and it seems like we can do so without infra: I just tried
> > > on your last commit as a test and was able to force-push the asf-site
> > > branch in the website repo.
> > >
> > > So basically it seems it needs something like: repopulate the asf-site
> > > branch (or a test branch) with the master history locally, simplify
> > > the build script to only build and nothing else, fix up the .gitignore
> > > file appropriately, build things, commit, and [force] push.
> > >
> > > Assuming of course others agree that it is what should happen?
> > >
> > > Robbie
> > >
>
>
>
> --
> Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
That solves my issue.. thanks a lot @Robbie!
On Wed, Oct 9, 2019 at 1:06 PM Robbie Gemmell <ro...@gmail.com> wrote:
>
> Its doing the same thing really, its just serving up the same build
> output that goes on the live server.
>
> In fact we should be tweaking the command to use the same 'content'
> target dir as the build, to allow inspecting the output changes with
> gi, and avoid having two copies of the generated site. It was
> previously using the default site-content since thats what the
> build.sh did too, but we just changed that.
>
> I've just made that change, adding a matching helper script for doing it.
>
> Robbie
>
> On Wed, 9 Oct 2019 at 16:55, Clebert Suconic <cl...@gmail.com> wrote:
> >
> > I knew you were going to say that :)
> >
> >
> > I wish there was a way to test the static... I will remove the branch
> > for now.. it's easy enough to place it back if needed.
> >
> > On Wed, Oct 9, 2019 at 11:47 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > >
> > > You can serve the site locally for testing using jekyll, generating
> > > new output on the fly as you update the source, by running:
> > > jekyll serve -s ./src
> > >
> > > https://github.com/apache/activemq-website/blob/master/README.md#to-build-the-site
> > >
> > > Robbie
> > >
> > > On Wed, 9 Oct 2019 at 15:20, Clebert Suconic <cl...@gmail.com> wrote:
> > > >
> > > > I actually don’t know how to test the website locally. When I open the
> > > > index it does not render properly.
> > > >
> > > > On Wed, Oct 9, 2019 at 10:17 AM Robbie Gemmell <ro...@gmail.com>
> > > > wrote:
> > > >
> > > > > Given the site is readily testable locally with its build tool, and
> > > > > how small+infrequent most updates to it are, I'd remove the branch
> > > > > personally. Seems likely to be stale most of the time, and its easily
> > > > > created again later if truly needed.
> > > > >
> > > > > On Tue, 8 Oct 2019 at 20:49, Clebert Suconic <cl...@gmail.com>
> > > > > wrote:
> > > > > >
> > > > > > There was a PR updating the navbar. It was an include and touched a
> > > > > > lot of files.
> > > > > >
> > > > > > So I tested with the "staging" feature. and it works like a charm.
> > > > > >
> > > > > > https://activemq.staged.apache.org
> > > > > >
> > > > > >
> > > > > > Should I keep the branch staging for future reference if anyone ever
> > > > > > wants to do testing again?
> > > > > >
> > > > > > What you guys think?
> > > > > >
> > > > > > On Tue, Oct 8, 2019 at 1:54 PM Clebert Suconic
> > > > > > <cl...@gmail.com> wrote:
> > > > > > >
> > > > > > > There was also a branch from the early days when Michal and Martyn
> > > > > > > were working on the website called "michaelandrepearce-patch-1-1"
> > > > > > > which I rempved and made a copy on my fork.
> > > > > > >
> > > > > > > Now there's only one branch which is called master.
> > > > > > >
> > > > > > > We could now use the staging feature on future releases :)
> > > > > > >
> > > > > > > On Tue, Oct 8, 2019 at 1:41 PM Clebert Suconic
> > > > > > > <cl...@gmail.com> wrote:
> > > > > > > >
> > > > > > > > I have removed it...
> > > > > > > >
> > > > > > > > (Just in case, I made a copy of it on my fork, just in case, which I
> > > > > > > > will remove it some day)
> > > > > > > >
> > > > > > > > On Tue, Oct 8, 2019 at 1:40 PM Clebert Suconic
> > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > I was actually going to ask if we can remove it...
> > > > > > > > >
> > > > > > > > > I believe I have authorization to remove the asf-site myself.
> > > > > > > > >
> > > > > > > > > On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > >
> > > > > > > > > > Great. I'd suggest deleting the asf-site branch now its unused,
> > > > > or
> > > > > > > > > > asking INFRA if it cant be removed, and closing the original
> > > > > infra
> > > > > > > > > > JIRA.
> > > > > > > > > >
> > > > > > > > > > On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <
> > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > >
> > > > > > > > > > > everything is on master now!!!
> > > > > > > > > > >
> > > > > > > > > > > I just did one dumb change to make sure the update worked, and
> > > > > it
> > > > > > > > > > > did... everything is on master now.
> > > > > > > > > > >
> > > > > > > > > > > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > Or, alternatively, instead of updating the contents of
> > > > > asf-site and
> > > > > > > > > > > > removing master, per the JIRA discussion we could change the
> > > > > site to
> > > > > > > > > > > > be published from master instead of asf-site ourselves by
> > > > > adding a
> > > > > > > > > > > > .asf.yaml file:
> > > > > > > > > > > > https://issues.apache.org/jira/browse/INFRA-19235
> > > > > > > > > > > >
> > > > > > > > > > > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > We can update the contents of the asf-site branch to suit
> > > > > our needs,
> > > > > > > > > > > > > the only requirement from infra is that the published
> > > > > content is in
> > > > > > > > > > > > > the content dir. The only thing we needed them to do would
> > > > > be change
> > > > > > > > > > > > > the default branch.
> > > > > > > > > > > > >
> > > > > > > > > > > > > Daniel will be talking about the new abilities offered by
> > > > > the more
> > > > > > > > > > > > > recently added asf.yaml stuff which can do various other
> > > > > things and
> > > > > > > > > > > > > override the existing website publishing stuff:
> > > > > > > > > > > > >
> > > > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > > > > > > > > > > >
> > > > > > > > > > > > > We can certainly look to add more of the stuff like
> > > > > staging etc if
> > > > > > > > > > > > > folks wanted, but I'd say its seperate from this change,
> > > > > and I dont
> > > > > > > > > > > > > personally see a real need for it right now.
> > > > > > > > > > > > >
> > > > > > > > > > > > > Robbie
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <
> > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > I'm not sure I see a need for creating another branch
> > > > > or asking infra
> > > > > > > > > > > > > > > to assist in the update itself. We are effectively
> > > > > just adding the
> > > > > > > > > > > > > > > source and history to the asf-site branch, which is
> > > > > where the site
> > > > > > > > > > > > > > > bits have to go, byt overwriting it, which we can do.
> > > > > The only thing
> > > > > > > > > > > > > > > we should really need infra to do is change the
> > > > > default branch setting
> > > > > > > > > > > > > > > to asf-site after the update is done, and then master
> > > > > can be removed.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > We could certainly do that. I just wanted to make sure
> > > > > Infra would
> > > > > > > > > > > > > > have no issues with the change.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Daniel is talking about a yaml file I never heard about,
> > > > > even talking
> > > > > > > > > > > > > > about staging website (which could be useful as part of
> > > > > our release
> > > > > > > > > > > > > > processes).
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > I'm getting confused through the JIRA. and I need help :)
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <
> > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > I will do the right thing. I will create a branch
> > > > > called future-master.
> > > > > > > > > > > > > > > > And ask infra to update everything.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > I will send a separate thread with a clear title.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > A necessary change would be updating the readme to
> > > > > describe the
> > > > > > > > > > > > > > > > > updated build + publish process. I've raised a PR
> > > > > against your test
> > > > > > > > > > > > > > > > > branch with suggested changes:
> > > > > > > > > > > > > > > > >
> > > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > Robbie
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > Do you mean move things over to the asf-site
> > > > > branch? Seems reasonable
> > > > > > > > > > > > > > > > > > to me. I'd start a separate thread though giving
> > > > > folks a heads up that
> > > > > > > > > > > > > > > > > > e.g you will do it tomorrow/some-other-point
> > > > > unless discussed
> > > > > > > > > > > > > > > > > > otherwise, so its clear when the change might
> > > > > happen and that lazy
> > > > > > > > > > > > > > > > > > consensus can be taken as only a few folks have
> > > > > commented on this
> > > > > > > > > > > > > > > > > > thread.
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <
> > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > Should we move it then ?
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > What you did is just what the exiting build
> > > > > script did, so that
> > > > > > > > > > > > > > > > > should
> > > > > > > > > > > > > > > > > > > > be fine if it was previously. I tried with
> > > > > and without the
> > > > > > > > > > > > > > > > > > > > --incremental and it didnt make a difference
> > > > > here (wasn't much
> > > > > > > > > > > > > > > > > > > > different time wise either). Strange that
> > > > > you saw this, and strange
> > > > > > > > > > > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic
> > > > > <
> > > > > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > I did not see the error again. I guess it
> > > > > was an effect of working
> > > > > > > > > > > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > I was playing with --incremental on jekyll
> > > > > perhaps that's what
> > > > > > > > > > > > > > > > > caused it.
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > Playing with a single branch would make it
> > > > > a lot easier. It
> > > > > > > > > > > > > > > > > bothers me
> > > > > > > > > > > > > > > > > > > > > to keep moving between branches as my IDE
> > > > > gets crazy on indexing
> > > > > > > > > > > > > > > > > files
> > > > > > > > > > > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I
> > > > > use vim emulation on idea
> > > > > > > > > > > > > > > > > > > > > though ;) )
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > If more people could double check this is
> > > > > okay.. perhaps we can
> > > > > > > > > > > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert
> > > > > Suconic
> > > > > > > > > > > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > > > > > > > > > > Move it.
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie
> > > > > Gemmell <
> > > > > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > > > >> I dont see that happen when I run the
> > > > > build, and hadnt actually
> > > > > > > > > > > > > > > > > ever
> > > > > > > > > > > > > > > > > > > > > >> seen the 'typechange' file status
> > > > > before.
> > > > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > > > >> The
> > > > > content/schema/core/activemq-core.xsd is actually a
> > > > > > > > > > > > > > > > > symlink, and
> > > > > > > > > > > > > > > > > > > > > >> some googling suggests the 'typechange'
> > > > > status mainly happens
> > > > > > > > > > > > > > > > > when
> > > > > > > > > > > > > > > > > > > > > >> such link is replaced with an actual
> > > > > file. If I do that
> > > > > > > > > > > > > > > > > deliberately,
> > > > > > > > > > > > > > > > > > > > > >> I then see the same status you do. Some
> > > > > posts suggested it can
> > > > > > > > > > > > > > > > > happen
> > > > > > > > > > > > > > > > > > > > > >> with certain copy commands, that have
> > > > > dereferenced the link and
> > > > > > > > > > > > > > > > > copied
> > > > > > > > > > > > > > > > > > > > > >> the referenced files content. How did
> > > > > you initially populate the
> > > > > > > > > > > > > > > > > > > > > >> 'content' dir your subsequent status is
> > > > > showing as being
> > > > > > > > > > > > > > > > > updated?
> > > > > > > > > > > > > > > > > > > > > >> Running the build afresh, or copying
> > > > > prior build output?
> > > > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert
> > > > > Suconic <
> > > > > > > > > > > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> > I have a branch where I'm using a
> > > > > single branch:
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> > The only concern I have so far is
> > > > > that any time I build, I
> > > > > > > > > > > > > > > > > get a
> > > > > > > > > > > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > > > > > > > > > > >> > (use "git add <file>..." to update
> > > > > what will be committed)
> > > > > > > > > > > > > > > > > > > > > >> > (use "git checkout -- <file>..." to
> > > > > discard changes in
> > > > > > > > > > > > > > > > > working
> > > > > > > > > > > > > > > > > > > > directory)
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> > typechange:
> > > > > content/schema/core/activemq-core.xsd
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> > Although I would consider that anyone
> > > > > would check stuff before
> > > > > > > > > > > > > > > > > > > > committing..
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin
> > > > > Bertram <
> > > > > > > > > > > > > > > > > jbertram@apache.org>
> > > > > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > > >> > > If it's simpler and documented that
> > > > > sounds like a win to me.
> > > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM
> > > > > Robbie Gemmell <
> > > > > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47,
> > > > > Clebert Suconic <
> > > > > > > > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM
> > > > > Robbie Gemmell <
> > > > > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and
> > > > > what I've seen other
> > > > > > > > > > > > > > > > > > > > > >> > > > > > projects do, I find it
> > > > > simpler overall.
> > > > > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > > > > > > > > > > >> > > > > I'm all +10000000 on this...
> > > > > what we need to change on
> > > > > > > > > > > > > > > > > infra.
> > > > > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > > > > >> > > > > Can we keep the history from
> > > > > master
> > > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > > >> > > > We wouldnt need to change much to
> > > > > get everything on the
> > > > > > > > > > > > > > > > > same
> > > > > > > > > > > > > > > > > > > > branch I
> > > > > > > > > > > > > > > > > > > > > >> > > > dont think, and it seems like we
> > > > > can do so without infra:
> > > > > > > > > > > > > > > > > I
> > > > > > > > > > > > > > > > > > > > just tried
> > > > > > > > > > > > > > > > > > > > > >> > > > on your last commit as a test and
> > > > > was able to force-push
> > > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > > >> > > > So basically it seems it needs
> > > > > something like: repopulate
> > > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > > > > > >> > > > branch (or a test branch) with
> > > > > the master history locally,
> > > > > > > > > > > > > > > > > > > > simplify
> > > > > > > > > > > > > > > > > > > > > >> > > > the build script to only build
> > > > > and nothing else, fix up
> > > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > > > > .gitignore
> > > > > > > > > > > > > > > > > > > > > >> > > > file appropriately, build things,
> > > > > commit, and [force]
> > > > > > > > > > > > > > > > > push.
> > > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > > >> > > > Assuming of course others agree
> > > > > that it is what should
> > > > > > > > > > > > > > > > > happen?
> > > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > > >> > --
> > > > > > > > > > > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > --
> > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > --
> > > > > > > > > > > Clebert Suconic
> > > > > > > > >
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > --
> > > > > > > > > Clebert Suconic
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > --
> > > > > > > > Clebert Suconic
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Clebert Suconic
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > > > >
> > > > --
> > > > Clebert Suconic
> >
> >
> >
> > --
> > Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
Its doing the same thing really, its just serving up the same build
output that goes on the live server.
In fact we should be tweaking the command to use the same 'content'
target dir as the build, to allow inspecting the output changes with
gi, and avoid having two copies of the generated site. It was
previously using the default site-content since thats what the
build.sh did too, but we just changed that.
I've just made that change, adding a matching helper script for doing it.
Robbie
On Wed, 9 Oct 2019 at 16:55, Clebert Suconic <cl...@gmail.com> wrote:
>
> I knew you were going to say that :)
>
>
> I wish there was a way to test the static... I will remove the branch
> for now.. it's easy enough to place it back if needed.
>
> On Wed, Oct 9, 2019 at 11:47 AM Robbie Gemmell <ro...@gmail.com> wrote:
> >
> > You can serve the site locally for testing using jekyll, generating
> > new output on the fly as you update the source, by running:
> > jekyll serve -s ./src
> >
> > https://github.com/apache/activemq-website/blob/master/README.md#to-build-the-site
> >
> > Robbie
> >
> > On Wed, 9 Oct 2019 at 15:20, Clebert Suconic <cl...@gmail.com> wrote:
> > >
> > > I actually don’t know how to test the website locally. When I open the
> > > index it does not render properly.
> > >
> > > On Wed, Oct 9, 2019 at 10:17 AM Robbie Gemmell <ro...@gmail.com>
> > > wrote:
> > >
> > > > Given the site is readily testable locally with its build tool, and
> > > > how small+infrequent most updates to it are, I'd remove the branch
> > > > personally. Seems likely to be stale most of the time, and its easily
> > > > created again later if truly needed.
> > > >
> > > > On Tue, 8 Oct 2019 at 20:49, Clebert Suconic <cl...@gmail.com>
> > > > wrote:
> > > > >
> > > > > There was a PR updating the navbar. It was an include and touched a
> > > > > lot of files.
> > > > >
> > > > > So I tested with the "staging" feature. and it works like a charm.
> > > > >
> > > > > https://activemq.staged.apache.org
> > > > >
> > > > >
> > > > > Should I keep the branch staging for future reference if anyone ever
> > > > > wants to do testing again?
> > > > >
> > > > > What you guys think?
> > > > >
> > > > > On Tue, Oct 8, 2019 at 1:54 PM Clebert Suconic
> > > > > <cl...@gmail.com> wrote:
> > > > > >
> > > > > > There was also a branch from the early days when Michal and Martyn
> > > > > > were working on the website called "michaelandrepearce-patch-1-1"
> > > > > > which I rempved and made a copy on my fork.
> > > > > >
> > > > > > Now there's only one branch which is called master.
> > > > > >
> > > > > > We could now use the staging feature on future releases :)
> > > > > >
> > > > > > On Tue, Oct 8, 2019 at 1:41 PM Clebert Suconic
> > > > > > <cl...@gmail.com> wrote:
> > > > > > >
> > > > > > > I have removed it...
> > > > > > >
> > > > > > > (Just in case, I made a copy of it on my fork, just in case, which I
> > > > > > > will remove it some day)
> > > > > > >
> > > > > > > On Tue, Oct 8, 2019 at 1:40 PM Clebert Suconic
> > > > > > > <cl...@gmail.com> wrote:
> > > > > > > >
> > > > > > > > I was actually going to ask if we can remove it...
> > > > > > > >
> > > > > > > > I believe I have authorization to remove the asf-site myself.
> > > > > > > >
> > > > > > > > On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <
> > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > Great. I'd suggest deleting the asf-site branch now its unused,
> > > > or
> > > > > > > > > asking INFRA if it cant be removed, and closing the original
> > > > infra
> > > > > > > > > JIRA.
> > > > > > > > >
> > > > > > > > > On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <
> > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > >
> > > > > > > > > > everything is on master now!!!
> > > > > > > > > >
> > > > > > > > > > I just did one dumb change to make sure the update worked, and
> > > > it
> > > > > > > > > > did... everything is on master now.
> > > > > > > > > >
> > > > > > > > > > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <
> > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > >
> > > > > > > > > > > Or, alternatively, instead of updating the contents of
> > > > asf-site and
> > > > > > > > > > > removing master, per the JIRA discussion we could change the
> > > > site to
> > > > > > > > > > > be published from master instead of asf-site ourselves by
> > > > adding a
> > > > > > > > > > > .asf.yaml file:
> > > > > > > > > > > https://issues.apache.org/jira/browse/INFRA-19235
> > > > > > > > > > >
> > > > > > > > > > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <
> > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > We can update the contents of the asf-site branch to suit
> > > > our needs,
> > > > > > > > > > > > the only requirement from infra is that the published
> > > > content is in
> > > > > > > > > > > > the content dir. The only thing we needed them to do would
> > > > be change
> > > > > > > > > > > > the default branch.
> > > > > > > > > > > >
> > > > > > > > > > > > Daniel will be talking about the new abilities offered by
> > > > the more
> > > > > > > > > > > > recently added asf.yaml stuff which can do various other
> > > > things and
> > > > > > > > > > > > override the existing website publishing stuff:
> > > > > > > > > > > >
> > > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > > > > > > > > > >
> > > > > > > > > > > > We can certainly look to add more of the stuff like
> > > > staging etc if
> > > > > > > > > > > > folks wanted, but I'd say its seperate from this change,
> > > > and I dont
> > > > > > > > > > > > personally see a real need for it right now.
> > > > > > > > > > > >
> > > > > > > > > > > > Robbie
> > > > > > > > > > > >
> > > > > > > > > > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <
> > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <
> > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > I'm not sure I see a need for creating another branch
> > > > or asking infra
> > > > > > > > > > > > > > to assist in the update itself. We are effectively
> > > > just adding the
> > > > > > > > > > > > > > source and history to the asf-site branch, which is
> > > > where the site
> > > > > > > > > > > > > > bits have to go, byt overwriting it, which we can do.
> > > > The only thing
> > > > > > > > > > > > > > we should really need infra to do is change the
> > > > default branch setting
> > > > > > > > > > > > > > to asf-site after the update is done, and then master
> > > > can be removed.
> > > > > > > > > > > > >
> > > > > > > > > > > > > We could certainly do that. I just wanted to make sure
> > > > Infra would
> > > > > > > > > > > > > have no issues with the change.
> > > > > > > > > > > > >
> > > > > > > > > > > > > Daniel is talking about a yaml file I never heard about,
> > > > even talking
> > > > > > > > > > > > > about staging website (which could be useful as part of
> > > > our release
> > > > > > > > > > > > > processes).
> > > > > > > > > > > > >
> > > > > > > > > > > > > I'm getting confused through the JIRA. and I need help :)
> > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <
> > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > I will do the right thing. I will create a branch
> > > > called future-master.
> > > > > > > > > > > > > > > And ask infra to update everything.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > I will send a separate thread with a clear title.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <
> > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > A necessary change would be updating the readme to
> > > > describe the
> > > > > > > > > > > > > > > > updated build + publish process. I've raised a PR
> > > > against your test
> > > > > > > > > > > > > > > > branch with suggested changes:
> > > > > > > > > > > > > > > >
> > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Robbie
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <
> > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > Do you mean move things over to the asf-site
> > > > branch? Seems reasonable
> > > > > > > > > > > > > > > > > to me. I'd start a separate thread though giving
> > > > folks a heads up that
> > > > > > > > > > > > > > > > > e.g you will do it tomorrow/some-other-point
> > > > unless discussed
> > > > > > > > > > > > > > > > > otherwise, so its clear when the change might
> > > > happen and that lazy
> > > > > > > > > > > > > > > > > consensus can be taken as only a few folks have
> > > > commented on this
> > > > > > > > > > > > > > > > > thread.
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <
> > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > Should we move it then ?
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > What you did is just what the exiting build
> > > > script did, so that
> > > > > > > > > > > > > > > > should
> > > > > > > > > > > > > > > > > > > be fine if it was previously. I tried with
> > > > and without the
> > > > > > > > > > > > > > > > > > > --incremental and it didnt make a difference
> > > > here (wasn't much
> > > > > > > > > > > > > > > > > > > different time wise either). Strange that
> > > > you saw this, and strange
> > > > > > > > > > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic
> > > > <
> > > > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > I did not see the error again. I guess it
> > > > was an effect of working
> > > > > > > > > > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > I was playing with --incremental on jekyll
> > > > perhaps that's what
> > > > > > > > > > > > > > > > caused it.
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > Playing with a single branch would make it
> > > > a lot easier. It
> > > > > > > > > > > > > > > > bothers me
> > > > > > > > > > > > > > > > > > > > to keep moving between branches as my IDE
> > > > gets crazy on indexing
> > > > > > > > > > > > > > > > files
> > > > > > > > > > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I
> > > > use vim emulation on idea
> > > > > > > > > > > > > > > > > > > > though ;) )
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > If more people could double check this is
> > > > okay.. perhaps we can
> > > > > > > > > > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert
> > > > Suconic
> > > > > > > > > > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > > > > > > > > > Move it.
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie
> > > > Gemmell <
> > > > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > > >> I dont see that happen when I run the
> > > > build, and hadnt actually
> > > > > > > > > > > > > > > > ever
> > > > > > > > > > > > > > > > > > > > >> seen the 'typechange' file status
> > > > before.
> > > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > > >> The
> > > > content/schema/core/activemq-core.xsd is actually a
> > > > > > > > > > > > > > > > symlink, and
> > > > > > > > > > > > > > > > > > > > >> some googling suggests the 'typechange'
> > > > status mainly happens
> > > > > > > > > > > > > > > > when
> > > > > > > > > > > > > > > > > > > > >> such link is replaced with an actual
> > > > file. If I do that
> > > > > > > > > > > > > > > > deliberately,
> > > > > > > > > > > > > > > > > > > > >> I then see the same status you do. Some
> > > > posts suggested it can
> > > > > > > > > > > > > > > > happen
> > > > > > > > > > > > > > > > > > > > >> with certain copy commands, that have
> > > > dereferenced the link and
> > > > > > > > > > > > > > > > copied
> > > > > > > > > > > > > > > > > > > > >> the referenced files content. How did
> > > > you initially populate the
> > > > > > > > > > > > > > > > > > > > >> 'content' dir your subsequent status is
> > > > showing as being
> > > > > > > > > > > > > > > > updated?
> > > > > > > > > > > > > > > > > > > > >> Running the build afresh, or copying
> > > > prior build output?
> > > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert
> > > > Suconic <
> > > > > > > > > > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> > I have a branch where I'm using a
> > > > single branch:
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> >
> > > > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> > The only concern I have so far is
> > > > that any time I build, I
> > > > > > > > > > > > > > > > get a
> > > > > > > > > > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > > > > > > > > > >> > (use "git add <file>..." to update
> > > > what will be committed)
> > > > > > > > > > > > > > > > > > > > >> > (use "git checkout -- <file>..." to
> > > > discard changes in
> > > > > > > > > > > > > > > > working
> > > > > > > > > > > > > > > > > > > directory)
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> > typechange:
> > > > content/schema/core/activemq-core.xsd
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> > Although I would consider that anyone
> > > > would check stuff before
> > > > > > > > > > > > > > > > > > > committing..
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin
> > > > Bertram <
> > > > > > > > > > > > > > > > jbertram@apache.org>
> > > > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > >> > > If it's simpler and documented that
> > > > sounds like a win to me.
> > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM
> > > > Robbie Gemmell <
> > > > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47,
> > > > Clebert Suconic <
> > > > > > > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM
> > > > Robbie Gemmell <
> > > > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and
> > > > what I've seen other
> > > > > > > > > > > > > > > > > > > > >> > > > > > projects do, I find it
> > > > simpler overall.
> > > > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > > > > > > > > > >> > > > > I'm all +10000000 on this...
> > > > what we need to change on
> > > > > > > > > > > > > > > > infra.
> > > > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > > > >> > > > > Can we keep the history from
> > > > master
> > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > >> > > > We wouldnt need to change much to
> > > > get everything on the
> > > > > > > > > > > > > > > > same
> > > > > > > > > > > > > > > > > > > branch I
> > > > > > > > > > > > > > > > > > > > >> > > > dont think, and it seems like we
> > > > can do so without infra:
> > > > > > > > > > > > > > > > I
> > > > > > > > > > > > > > > > > > > just tried
> > > > > > > > > > > > > > > > > > > > >> > > > on your last commit as a test and
> > > > was able to force-push
> > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > >> > > > So basically it seems it needs
> > > > something like: repopulate
> > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > > > > >> > > > branch (or a test branch) with
> > > > the master history locally,
> > > > > > > > > > > > > > > > > > > simplify
> > > > > > > > > > > > > > > > > > > > >> > > > the build script to only build
> > > > and nothing else, fix up
> > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > > > .gitignore
> > > > > > > > > > > > > > > > > > > > >> > > > file appropriately, build things,
> > > > commit, and [force]
> > > > > > > > > > > > > > > > push.
> > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > >> > > > Assuming of course others agree
> > > > that it is what should
> > > > > > > > > > > > > > > > happen?
> > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > > >> > --
> > > > > > > > > > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > > --
> > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > --
> > > > > > > > > > Clebert Suconic
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > --
> > > > > > > > Clebert Suconic
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Clebert Suconic
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Clebert Suconic
> > > >
> > > --
> > > Clebert Suconic
>
>
>
> --
> Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
I knew you were going to say that :)
I wish there was a way to test the static... I will remove the branch
for now.. it's easy enough to place it back if needed.
On Wed, Oct 9, 2019 at 11:47 AM Robbie Gemmell <ro...@gmail.com> wrote:
>
> You can serve the site locally for testing using jekyll, generating
> new output on the fly as you update the source, by running:
> jekyll serve -s ./src
>
> https://github.com/apache/activemq-website/blob/master/README.md#to-build-the-site
>
> Robbie
>
> On Wed, 9 Oct 2019 at 15:20, Clebert Suconic <cl...@gmail.com> wrote:
> >
> > I actually don’t know how to test the website locally. When I open the
> > index it does not render properly.
> >
> > On Wed, Oct 9, 2019 at 10:17 AM Robbie Gemmell <ro...@gmail.com>
> > wrote:
> >
> > > Given the site is readily testable locally with its build tool, and
> > > how small+infrequent most updates to it are, I'd remove the branch
> > > personally. Seems likely to be stale most of the time, and its easily
> > > created again later if truly needed.
> > >
> > > On Tue, 8 Oct 2019 at 20:49, Clebert Suconic <cl...@gmail.com>
> > > wrote:
> > > >
> > > > There was a PR updating the navbar. It was an include and touched a
> > > > lot of files.
> > > >
> > > > So I tested with the "staging" feature. and it works like a charm.
> > > >
> > > > https://activemq.staged.apache.org
> > > >
> > > >
> > > > Should I keep the branch staging for future reference if anyone ever
> > > > wants to do testing again?
> > > >
> > > > What you guys think?
> > > >
> > > > On Tue, Oct 8, 2019 at 1:54 PM Clebert Suconic
> > > > <cl...@gmail.com> wrote:
> > > > >
> > > > > There was also a branch from the early days when Michal and Martyn
> > > > > were working on the website called "michaelandrepearce-patch-1-1"
> > > > > which I rempved and made a copy on my fork.
> > > > >
> > > > > Now there's only one branch which is called master.
> > > > >
> > > > > We could now use the staging feature on future releases :)
> > > > >
> > > > > On Tue, Oct 8, 2019 at 1:41 PM Clebert Suconic
> > > > > <cl...@gmail.com> wrote:
> > > > > >
> > > > > > I have removed it...
> > > > > >
> > > > > > (Just in case, I made a copy of it on my fork, just in case, which I
> > > > > > will remove it some day)
> > > > > >
> > > > > > On Tue, Oct 8, 2019 at 1:40 PM Clebert Suconic
> > > > > > <cl...@gmail.com> wrote:
> > > > > > >
> > > > > > > I was actually going to ask if we can remove it...
> > > > > > >
> > > > > > > I believe I have authorization to remove the asf-site myself.
> > > > > > >
> > > > > > > On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <
> > > robbie.gemmell@gmail.com> wrote:
> > > > > > > >
> > > > > > > > Great. I'd suggest deleting the asf-site branch now its unused,
> > > or
> > > > > > > > asking INFRA if it cant be removed, and closing the original
> > > infra
> > > > > > > > JIRA.
> > > > > > > >
> > > > > > > > On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <
> > > clebert.suconic@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > everything is on master now!!!
> > > > > > > > >
> > > > > > > > > I just did one dumb change to make sure the update worked, and
> > > it
> > > > > > > > > did... everything is on master now.
> > > > > > > > >
> > > > > > > > > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <
> > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > >
> > > > > > > > > > Or, alternatively, instead of updating the contents of
> > > asf-site and
> > > > > > > > > > removing master, per the JIRA discussion we could change the
> > > site to
> > > > > > > > > > be published from master instead of asf-site ourselves by
> > > adding a
> > > > > > > > > > .asf.yaml file:
> > > > > > > > > > https://issues.apache.org/jira/browse/INFRA-19235
> > > > > > > > > >
> > > > > > > > > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <
> > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > >
> > > > > > > > > > > We can update the contents of the asf-site branch to suit
> > > our needs,
> > > > > > > > > > > the only requirement from infra is that the published
> > > content is in
> > > > > > > > > > > the content dir. The only thing we needed them to do would
> > > be change
> > > > > > > > > > > the default branch.
> > > > > > > > > > >
> > > > > > > > > > > Daniel will be talking about the new abilities offered by
> > > the more
> > > > > > > > > > > recently added asf.yaml stuff which can do various other
> > > things and
> > > > > > > > > > > override the existing website publishing stuff:
> > > > > > > > > > >
> > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > > > > > > > > >
> > > > > > > > > > > We can certainly look to add more of the stuff like
> > > staging etc if
> > > > > > > > > > > folks wanted, but I'd say its seperate from this change,
> > > and I dont
> > > > > > > > > > > personally see a real need for it right now.
> > > > > > > > > > >
> > > > > > > > > > > Robbie
> > > > > > > > > > >
> > > > > > > > > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <
> > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <
> > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > I'm not sure I see a need for creating another branch
> > > or asking infra
> > > > > > > > > > > > > to assist in the update itself. We are effectively
> > > just adding the
> > > > > > > > > > > > > source and history to the asf-site branch, which is
> > > where the site
> > > > > > > > > > > > > bits have to go, byt overwriting it, which we can do.
> > > The only thing
> > > > > > > > > > > > > we should really need infra to do is change the
> > > default branch setting
> > > > > > > > > > > > > to asf-site after the update is done, and then master
> > > can be removed.
> > > > > > > > > > > >
> > > > > > > > > > > > We could certainly do that. I just wanted to make sure
> > > Infra would
> > > > > > > > > > > > have no issues with the change.
> > > > > > > > > > > >
> > > > > > > > > > > > Daniel is talking about a yaml file I never heard about,
> > > even talking
> > > > > > > > > > > > about staging website (which could be useful as part of
> > > our release
> > > > > > > > > > > > processes).
> > > > > > > > > > > >
> > > > > > > > > > > > I'm getting confused through the JIRA. and I need help :)
> > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <
> > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > I will do the right thing. I will create a branch
> > > called future-master.
> > > > > > > > > > > > > > And ask infra to update everything.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > I will send a separate thread with a clear title.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <
> > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > > A necessary change would be updating the readme to
> > > describe the
> > > > > > > > > > > > > > > updated build + publish process. I've raised a PR
> > > against your test
> > > > > > > > > > > > > > > branch with suggested changes:
> > > > > > > > > > > > > > >
> > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Robbie
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <
> > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Do you mean move things over to the asf-site
> > > branch? Seems reasonable
> > > > > > > > > > > > > > > > to me. I'd start a separate thread though giving
> > > folks a heads up that
> > > > > > > > > > > > > > > > e.g you will do it tomorrow/some-other-point
> > > unless discussed
> > > > > > > > > > > > > > > > otherwise, so its clear when the change might
> > > happen and that lazy
> > > > > > > > > > > > > > > > consensus can be taken as only a few folks have
> > > commented on this
> > > > > > > > > > > > > > > > thread.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <
> > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > Should we move it then ?
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > What you did is just what the exiting build
> > > script did, so that
> > > > > > > > > > > > > > > should
> > > > > > > > > > > > > > > > > > be fine if it was previously. I tried with
> > > and without the
> > > > > > > > > > > > > > > > > > --incremental and it didnt make a difference
> > > here (wasn't much
> > > > > > > > > > > > > > > > > > different time wise either). Strange that
> > > you saw this, and strange
> > > > > > > > > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic
> > > <
> > > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > I did not see the error again. I guess it
> > > was an effect of working
> > > > > > > > > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > I was playing with --incremental on jekyll
> > > perhaps that's what
> > > > > > > > > > > > > > > caused it.
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > Playing with a single branch would make it
> > > a lot easier. It
> > > > > > > > > > > > > > > bothers me
> > > > > > > > > > > > > > > > > > > to keep moving between branches as my IDE
> > > gets crazy on indexing
> > > > > > > > > > > > > > > files
> > > > > > > > > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I
> > > use vim emulation on idea
> > > > > > > > > > > > > > > > > > > though ;) )
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > If more people could double check this is
> > > okay.. perhaps we can
> > > > > > > > > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert
> > > Suconic
> > > > > > > > > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > > > > > > > > Move it.
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie
> > > Gemmell <
> > > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > >> I dont see that happen when I run the
> > > build, and hadnt actually
> > > > > > > > > > > > > > > ever
> > > > > > > > > > > > > > > > > > > >> seen the 'typechange' file status
> > > before.
> > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > >> The
> > > content/schema/core/activemq-core.xsd is actually a
> > > > > > > > > > > > > > > symlink, and
> > > > > > > > > > > > > > > > > > > >> some googling suggests the 'typechange'
> > > status mainly happens
> > > > > > > > > > > > > > > when
> > > > > > > > > > > > > > > > > > > >> such link is replaced with an actual
> > > file. If I do that
> > > > > > > > > > > > > > > deliberately,
> > > > > > > > > > > > > > > > > > > >> I then see the same status you do. Some
> > > posts suggested it can
> > > > > > > > > > > > > > > happen
> > > > > > > > > > > > > > > > > > > >> with certain copy commands, that have
> > > dereferenced the link and
> > > > > > > > > > > > > > > copied
> > > > > > > > > > > > > > > > > > > >> the referenced files content. How did
> > > you initially populate the
> > > > > > > > > > > > > > > > > > > >> 'content' dir your subsequent status is
> > > showing as being
> > > > > > > > > > > > > > > updated?
> > > > > > > > > > > > > > > > > > > >> Running the build afresh, or copying
> > > prior build output?
> > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert
> > > Suconic <
> > > > > > > > > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> > I have a branch where I'm using a
> > > single branch:
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> >
> > > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> > The only concern I have so far is
> > > that any time I build, I
> > > > > > > > > > > > > > > get a
> > > > > > > > > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > > > > > > > > >> > (use "git add <file>..." to update
> > > what will be committed)
> > > > > > > > > > > > > > > > > > > >> > (use "git checkout -- <file>..." to
> > > discard changes in
> > > > > > > > > > > > > > > working
> > > > > > > > > > > > > > > > > > directory)
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> > typechange:
> > > content/schema/core/activemq-core.xsd
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> > Although I would consider that anyone
> > > would check stuff before
> > > > > > > > > > > > > > > > > > committing..
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin
> > > Bertram <
> > > > > > > > > > > > > > > jbertram@apache.org>
> > > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > >> > > If it's simpler and documented that
> > > sounds like a win to me.
> > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM
> > > Robbie Gemmell <
> > > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47,
> > > Clebert Suconic <
> > > > > > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM
> > > Robbie Gemmell <
> > > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and
> > > what I've seen other
> > > > > > > > > > > > > > > > > > > >> > > > > > projects do, I find it
> > > simpler overall.
> > > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > > > > > > > > >> > > > > I'm all +10000000 on this...
> > > what we need to change on
> > > > > > > > > > > > > > > infra.
> > > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > > >> > > > > Can we keep the history from
> > > master
> > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > >> > > > We wouldnt need to change much to
> > > get everything on the
> > > > > > > > > > > > > > > same
> > > > > > > > > > > > > > > > > > branch I
> > > > > > > > > > > > > > > > > > > >> > > > dont think, and it seems like we
> > > can do so without infra:
> > > > > > > > > > > > > > > I
> > > > > > > > > > > > > > > > > > just tried
> > > > > > > > > > > > > > > > > > > >> > > > on your last commit as a test and
> > > was able to force-push
> > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > >> > > > So basically it seems it needs
> > > something like: repopulate
> > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > > > >> > > > branch (or a test branch) with
> > > the master history locally,
> > > > > > > > > > > > > > > > > > simplify
> > > > > > > > > > > > > > > > > > > >> > > > the build script to only build
> > > and nothing else, fix up
> > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > > .gitignore
> > > > > > > > > > > > > > > > > > > >> > > > file appropriately, build things,
> > > commit, and [force]
> > > > > > > > > > > > > > > push.
> > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > >> > > > Assuming of course others agree
> > > that it is what should
> > > > > > > > > > > > > > > happen?
> > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > > >> > --
> > > > > > > > > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > --
> > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > > --
> > > > > > > > > > > > Clebert Suconic
> > > > > > > > >
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > --
> > > > > > > > > Clebert Suconic
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Clebert Suconic
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Clebert Suconic
> > > >
> > > >
> > > >
> > > > --
> > > > Clebert Suconic
> > >
> > --
> > Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
You can serve the site locally for testing using jekyll, generating
new output on the fly as you update the source, by running:
jekyll serve -s ./src
https://github.com/apache/activemq-website/blob/master/README.md#to-build-the-site
Robbie
On Wed, 9 Oct 2019 at 15:20, Clebert Suconic <cl...@gmail.com> wrote:
>
> I actually don’t know how to test the website locally. When I open the
> index it does not render properly.
>
> On Wed, Oct 9, 2019 at 10:17 AM Robbie Gemmell <ro...@gmail.com>
> wrote:
>
> > Given the site is readily testable locally with its build tool, and
> > how small+infrequent most updates to it are, I'd remove the branch
> > personally. Seems likely to be stale most of the time, and its easily
> > created again later if truly needed.
> >
> > On Tue, 8 Oct 2019 at 20:49, Clebert Suconic <cl...@gmail.com>
> > wrote:
> > >
> > > There was a PR updating the navbar. It was an include and touched a
> > > lot of files.
> > >
> > > So I tested with the "staging" feature. and it works like a charm.
> > >
> > > https://activemq.staged.apache.org
> > >
> > >
> > > Should I keep the branch staging for future reference if anyone ever
> > > wants to do testing again?
> > >
> > > What you guys think?
> > >
> > > On Tue, Oct 8, 2019 at 1:54 PM Clebert Suconic
> > > <cl...@gmail.com> wrote:
> > > >
> > > > There was also a branch from the early days when Michal and Martyn
> > > > were working on the website called "michaelandrepearce-patch-1-1"
> > > > which I rempved and made a copy on my fork.
> > > >
> > > > Now there's only one branch which is called master.
> > > >
> > > > We could now use the staging feature on future releases :)
> > > >
> > > > On Tue, Oct 8, 2019 at 1:41 PM Clebert Suconic
> > > > <cl...@gmail.com> wrote:
> > > > >
> > > > > I have removed it...
> > > > >
> > > > > (Just in case, I made a copy of it on my fork, just in case, which I
> > > > > will remove it some day)
> > > > >
> > > > > On Tue, Oct 8, 2019 at 1:40 PM Clebert Suconic
> > > > > <cl...@gmail.com> wrote:
> > > > > >
> > > > > > I was actually going to ask if we can remove it...
> > > > > >
> > > > > > I believe I have authorization to remove the asf-site myself.
> > > > > >
> > > > > > On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <
> > robbie.gemmell@gmail.com> wrote:
> > > > > > >
> > > > > > > Great. I'd suggest deleting the asf-site branch now its unused,
> > or
> > > > > > > asking INFRA if it cant be removed, and closing the original
> > infra
> > > > > > > JIRA.
> > > > > > >
> > > > > > > On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <
> > clebert.suconic@gmail.com> wrote:
> > > > > > > >
> > > > > > > > everything is on master now!!!
> > > > > > > >
> > > > > > > > I just did one dumb change to make sure the update worked, and
> > it
> > > > > > > > did... everything is on master now.
> > > > > > > >
> > > > > > > > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <
> > robbie.gemmell@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > Or, alternatively, instead of updating the contents of
> > asf-site and
> > > > > > > > > removing master, per the JIRA discussion we could change the
> > site to
> > > > > > > > > be published from master instead of asf-site ourselves by
> > adding a
> > > > > > > > > .asf.yaml file:
> > > > > > > > > https://issues.apache.org/jira/browse/INFRA-19235
> > > > > > > > >
> > > > > > > > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <
> > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > >
> > > > > > > > > > We can update the contents of the asf-site branch to suit
> > our needs,
> > > > > > > > > > the only requirement from infra is that the published
> > content is in
> > > > > > > > > > the content dir. The only thing we needed them to do would
> > be change
> > > > > > > > > > the default branch.
> > > > > > > > > >
> > > > > > > > > > Daniel will be talking about the new abilities offered by
> > the more
> > > > > > > > > > recently added asf.yaml stuff which can do various other
> > things and
> > > > > > > > > > override the existing website publishing stuff:
> > > > > > > > > >
> > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > > > > > > > >
> > > > > > > > > > We can certainly look to add more of the stuff like
> > staging etc if
> > > > > > > > > > folks wanted, but I'd say its seperate from this change,
> > and I dont
> > > > > > > > > > personally see a real need for it right now.
> > > > > > > > > >
> > > > > > > > > > Robbie
> > > > > > > > > >
> > > > > > > > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <
> > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > >
> > > > > > > > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <
> > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > I'm not sure I see a need for creating another branch
> > or asking infra
> > > > > > > > > > > > to assist in the update itself. We are effectively
> > just adding the
> > > > > > > > > > > > source and history to the asf-site branch, which is
> > where the site
> > > > > > > > > > > > bits have to go, byt overwriting it, which we can do.
> > The only thing
> > > > > > > > > > > > we should really need infra to do is change the
> > default branch setting
> > > > > > > > > > > > to asf-site after the update is done, and then master
> > can be removed.
> > > > > > > > > > >
> > > > > > > > > > > We could certainly do that. I just wanted to make sure
> > Infra would
> > > > > > > > > > > have no issues with the change.
> > > > > > > > > > >
> > > > > > > > > > > Daniel is talking about a yaml file I never heard about,
> > even talking
> > > > > > > > > > > about staging website (which could be useful as part of
> > our release
> > > > > > > > > > > processes).
> > > > > > > > > > >
> > > > > > > > > > > I'm getting confused through the JIRA. and I need help :)
> > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <
> > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > I will do the right thing. I will create a branch
> > called future-master.
> > > > > > > > > > > > > And ask infra to update everything.
> > > > > > > > > > > > >
> > > > > > > > > > > > > I will send a separate thread with a clear title.
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <
> > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > > A necessary change would be updating the readme to
> > describe the
> > > > > > > > > > > > > > updated build + publish process. I've raised a PR
> > against your test
> > > > > > > > > > > > > > branch with suggested changes:
> > > > > > > > > > > > > >
> > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Robbie
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <
> > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Do you mean move things over to the asf-site
> > branch? Seems reasonable
> > > > > > > > > > > > > > > to me. I'd start a separate thread though giving
> > folks a heads up that
> > > > > > > > > > > > > > > e.g you will do it tomorrow/some-other-point
> > unless discussed
> > > > > > > > > > > > > > > otherwise, so its clear when the change might
> > happen and that lazy
> > > > > > > > > > > > > > > consensus can be taken as only a few folks have
> > commented on this
> > > > > > > > > > > > > > > thread.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <
> > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Should we move it then ?
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > What you did is just what the exiting build
> > script did, so that
> > > > > > > > > > > > > > should
> > > > > > > > > > > > > > > > > be fine if it was previously. I tried with
> > and without the
> > > > > > > > > > > > > > > > > --incremental and it didnt make a difference
> > here (wasn't much
> > > > > > > > > > > > > > > > > different time wise either). Strange that
> > you saw this, and strange
> > > > > > > > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic
> > <
> > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > I did not see the error again. I guess it
> > was an effect of working
> > > > > > > > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > I was playing with --incremental on jekyll
> > perhaps that's what
> > > > > > > > > > > > > > caused it.
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > Playing with a single branch would make it
> > a lot easier. It
> > > > > > > > > > > > > > bothers me
> > > > > > > > > > > > > > > > > > to keep moving between branches as my IDE
> > gets crazy on indexing
> > > > > > > > > > > > > > files
> > > > > > > > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I
> > use vim emulation on idea
> > > > > > > > > > > > > > > > > > though ;) )
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > If more people could double check this is
> > okay.. perhaps we can
> > > > > > > > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert
> > Suconic
> > > > > > > > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > > > > > > > Move it.
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie
> > Gemmell <
> > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > >> I dont see that happen when I run the
> > build, and hadnt actually
> > > > > > > > > > > > > > ever
> > > > > > > > > > > > > > > > > > >> seen the 'typechange' file status
> > before.
> > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > >> The
> > content/schema/core/activemq-core.xsd is actually a
> > > > > > > > > > > > > > symlink, and
> > > > > > > > > > > > > > > > > > >> some googling suggests the 'typechange'
> > status mainly happens
> > > > > > > > > > > > > > when
> > > > > > > > > > > > > > > > > > >> such link is replaced with an actual
> > file. If I do that
> > > > > > > > > > > > > > deliberately,
> > > > > > > > > > > > > > > > > > >> I then see the same status you do. Some
> > posts suggested it can
> > > > > > > > > > > > > > happen
> > > > > > > > > > > > > > > > > > >> with certain copy commands, that have
> > dereferenced the link and
> > > > > > > > > > > > > > copied
> > > > > > > > > > > > > > > > > > >> the referenced files content. How did
> > you initially populate the
> > > > > > > > > > > > > > > > > > >> 'content' dir your subsequent status is
> > showing as being
> > > > > > > > > > > > > > updated?
> > > > > > > > > > > > > > > > > > >> Running the build afresh, or copying
> > prior build output?
> > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert
> > Suconic <
> > > > > > > > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> > I have a branch where I'm using a
> > single branch:
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> >
> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> > The only concern I have so far is
> > that any time I build, I
> > > > > > > > > > > > > > get a
> > > > > > > > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > > > > > > > >> > (use "git add <file>..." to update
> > what will be committed)
> > > > > > > > > > > > > > > > > > >> > (use "git checkout -- <file>..." to
> > discard changes in
> > > > > > > > > > > > > > working
> > > > > > > > > > > > > > > > > directory)
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> > typechange:
> > content/schema/core/activemq-core.xsd
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> > Although I would consider that anyone
> > would check stuff before
> > > > > > > > > > > > > > > > > committing..
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin
> > Bertram <
> > > > > > > > > > > > > > jbertram@apache.org>
> > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > >> > > If it's simpler and documented that
> > sounds like a win to me.
> > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM
> > Robbie Gemmell <
> > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47,
> > Clebert Suconic <
> > > > > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM
> > Robbie Gemmell <
> > > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and
> > what I've seen other
> > > > > > > > > > > > > > > > > > >> > > > > > projects do, I find it
> > simpler overall.
> > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > > > > > > > >> > > > > I'm all +10000000 on this...
> > what we need to change on
> > > > > > > > > > > > > > infra.
> > > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > > >> > > > > Can we keep the history from
> > master
> > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > >> > > > We wouldnt need to change much to
> > get everything on the
> > > > > > > > > > > > > > same
> > > > > > > > > > > > > > > > > branch I
> > > > > > > > > > > > > > > > > > >> > > > dont think, and it seems like we
> > can do so without infra:
> > > > > > > > > > > > > > I
> > > > > > > > > > > > > > > > > just tried
> > > > > > > > > > > > > > > > > > >> > > > on your last commit as a test and
> > was able to force-push
> > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > >> > > > So basically it seems it needs
> > something like: repopulate
> > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > > >> > > > branch (or a test branch) with
> > the master history locally,
> > > > > > > > > > > > > > > > > simplify
> > > > > > > > > > > > > > > > > > >> > > > the build script to only build
> > and nothing else, fix up
> > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > > .gitignore
> > > > > > > > > > > > > > > > > > >> > > > file appropriately, build things,
> > commit, and [force]
> > > > > > > > > > > > > > push.
> > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > >> > > > Assuming of course others agree
> > that it is what should
> > > > > > > > > > > > > > happen?
> > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > > >> > --
> > > > > > > > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > >
> > > > > > > > > > > > > --
> > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > --
> > > > > > > > > > > Clebert Suconic
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > --
> > > > > > > > Clebert Suconic
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Clebert Suconic
> > > >
> > > >
> > > >
> > > > --
> > > > Clebert Suconic
> > >
> > >
> > >
> > > --
> > > Clebert Suconic
> >
> --
> Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
I actually don’t know how to test the website locally. When I open the
index it does not render properly.
On Wed, Oct 9, 2019 at 10:17 AM Robbie Gemmell <ro...@gmail.com>
wrote:
> Given the site is readily testable locally with its build tool, and
> how small+infrequent most updates to it are, I'd remove the branch
> personally. Seems likely to be stale most of the time, and its easily
> created again later if truly needed.
>
> On Tue, 8 Oct 2019 at 20:49, Clebert Suconic <cl...@gmail.com>
> wrote:
> >
> > There was a PR updating the navbar. It was an include and touched a
> > lot of files.
> >
> > So I tested with the "staging" feature. and it works like a charm.
> >
> > https://activemq.staged.apache.org
> >
> >
> > Should I keep the branch staging for future reference if anyone ever
> > wants to do testing again?
> >
> > What you guys think?
> >
> > On Tue, Oct 8, 2019 at 1:54 PM Clebert Suconic
> > <cl...@gmail.com> wrote:
> > >
> > > There was also a branch from the early days when Michal and Martyn
> > > were working on the website called "michaelandrepearce-patch-1-1"
> > > which I rempved and made a copy on my fork.
> > >
> > > Now there's only one branch which is called master.
> > >
> > > We could now use the staging feature on future releases :)
> > >
> > > On Tue, Oct 8, 2019 at 1:41 PM Clebert Suconic
> > > <cl...@gmail.com> wrote:
> > > >
> > > > I have removed it...
> > > >
> > > > (Just in case, I made a copy of it on my fork, just in case, which I
> > > > will remove it some day)
> > > >
> > > > On Tue, Oct 8, 2019 at 1:40 PM Clebert Suconic
> > > > <cl...@gmail.com> wrote:
> > > > >
> > > > > I was actually going to ask if we can remove it...
> > > > >
> > > > > I believe I have authorization to remove the asf-site myself.
> > > > >
> > > > > On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <
> robbie.gemmell@gmail.com> wrote:
> > > > > >
> > > > > > Great. I'd suggest deleting the asf-site branch now its unused,
> or
> > > > > > asking INFRA if it cant be removed, and closing the original
> infra
> > > > > > JIRA.
> > > > > >
> > > > > > On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <
> clebert.suconic@gmail.com> wrote:
> > > > > > >
> > > > > > > everything is on master now!!!
> > > > > > >
> > > > > > > I just did one dumb change to make sure the update worked, and
> it
> > > > > > > did... everything is on master now.
> > > > > > >
> > > > > > > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <
> robbie.gemmell@gmail.com> wrote:
> > > > > > > >
> > > > > > > > Or, alternatively, instead of updating the contents of
> asf-site and
> > > > > > > > removing master, per the JIRA discussion we could change the
> site to
> > > > > > > > be published from master instead of asf-site ourselves by
> adding a
> > > > > > > > .asf.yaml file:
> > > > > > > > https://issues.apache.org/jira/browse/INFRA-19235
> > > > > > > >
> > > > > > > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <
> robbie.gemmell@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > We can update the contents of the asf-site branch to suit
> our needs,
> > > > > > > > > the only requirement from infra is that the published
> content is in
> > > > > > > > > the content dir. The only thing we needed them to do would
> be change
> > > > > > > > > the default branch.
> > > > > > > > >
> > > > > > > > > Daniel will be talking about the new abilities offered by
> the more
> > > > > > > > > recently added asf.yaml stuff which can do various other
> things and
> > > > > > > > > override the existing website publishing stuff:
> > > > > > > > >
> https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > > > > > > >
> > > > > > > > > We can certainly look to add more of the stuff like
> staging etc if
> > > > > > > > > folks wanted, but I'd say its seperate from this change,
> and I dont
> > > > > > > > > personally see a real need for it right now.
> > > > > > > > >
> > > > > > > > > Robbie
> > > > > > > > >
> > > > > > > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <
> clebert.suconic@gmail.com> wrote:
> > > > > > > > > >
> > > > > > > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <
> robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > >
> > > > > > > > > > > I'm not sure I see a need for creating another branch
> or asking infra
> > > > > > > > > > > to assist in the update itself. We are effectively
> just adding the
> > > > > > > > > > > source and history to the asf-site branch, which is
> where the site
> > > > > > > > > > > bits have to go, byt overwriting it, which we can do.
> The only thing
> > > > > > > > > > > we should really need infra to do is change the
> default branch setting
> > > > > > > > > > > to asf-site after the update is done, and then master
> can be removed.
> > > > > > > > > >
> > > > > > > > > > We could certainly do that. I just wanted to make sure
> Infra would
> > > > > > > > > > have no issues with the change.
> > > > > > > > > >
> > > > > > > > > > Daniel is talking about a yaml file I never heard about,
> even talking
> > > > > > > > > > about staging website (which could be useful as part of
> our release
> > > > > > > > > > processes).
> > > > > > > > > >
> > > > > > > > > > I'm getting confused through the JIRA. and I need help :)
> > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <
> clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > I will do the right thing. I will create a branch
> called future-master.
> > > > > > > > > > > > And ask infra to update everything.
> > > > > > > > > > > >
> > > > > > > > > > > > I will send a separate thread with a clear title.
> > > > > > > > > > > >
> > > > > > > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <
> robbie.gemmell@gmail.com>
> > > > > > > > > > > > wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > > A necessary change would be updating the readme to
> describe the
> > > > > > > > > > > > > updated build + publish process. I've raised a PR
> against your test
> > > > > > > > > > > > > branch with suggested changes:
> > > > > > > > > > > > >
> https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > > > > > > >
> > > > > > > > > > > > > Robbie
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <
> robbie.gemmell@gmail.com>
> > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Do you mean move things over to the asf-site
> branch? Seems reasonable
> > > > > > > > > > > > > > to me. I'd start a separate thread though giving
> folks a heads up that
> > > > > > > > > > > > > > e.g you will do it tomorrow/some-other-point
> unless discussed
> > > > > > > > > > > > > > otherwise, so its clear when the change might
> happen and that lazy
> > > > > > > > > > > > > > consensus can be taken as only a few folks have
> commented on this
> > > > > > > > > > > > > > thread.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <
> clebert.suconic@gmail.com>
> > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Should we move it then ?
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > What you did is just what the exiting build
> script did, so that
> > > > > > > > > > > > > should
> > > > > > > > > > > > > > > > be fine if it was previously. I tried with
> and without the
> > > > > > > > > > > > > > > > --incremental and it didnt make a difference
> here (wasn't much
> > > > > > > > > > > > > > > > different time wise either). Strange that
> you saw this, and strange
> > > > > > > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic
> <
> > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > I did not see the error again. I guess it
> was an effect of working
> > > > > > > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > I was playing with --incremental on jekyll
> perhaps that's what
> > > > > > > > > > > > > caused it.
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > Playing with a single branch would make it
> a lot easier. It
> > > > > > > > > > > > > bothers me
> > > > > > > > > > > > > > > > > to keep moving between branches as my IDE
> gets crazy on indexing
> > > > > > > > > > > > > files
> > > > > > > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I
> use vim emulation on idea
> > > > > > > > > > > > > > > > > though ;) )
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > If more people could double check this is
> okay.. perhaps we can
> > > > > > > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert
> Suconic
> > > > > > > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > > > > > > Move it.
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie
> Gemmell <
> > > > > > > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > >> I dont see that happen when I run the
> build, and hadnt actually
> > > > > > > > > > > > > ever
> > > > > > > > > > > > > > > > > >> seen the 'typechange' file status
> before.
> > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > >> The
> content/schema/core/activemq-core.xsd is actually a
> > > > > > > > > > > > > symlink, and
> > > > > > > > > > > > > > > > > >> some googling suggests the 'typechange'
> status mainly happens
> > > > > > > > > > > > > when
> > > > > > > > > > > > > > > > > >> such link is replaced with an actual
> file. If I do that
> > > > > > > > > > > > > deliberately,
> > > > > > > > > > > > > > > > > >> I then see the same status you do. Some
> posts suggested it can
> > > > > > > > > > > > > happen
> > > > > > > > > > > > > > > > > >> with certain copy commands, that have
> dereferenced the link and
> > > > > > > > > > > > > copied
> > > > > > > > > > > > > > > > > >> the referenced files content. How did
> you initially populate the
> > > > > > > > > > > > > > > > > >> 'content' dir your subsequent status is
> showing as being
> > > > > > > > > > > > > updated?
> > > > > > > > > > > > > > > > > >> Running the build afresh, or copying
> prior build output?
> > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert
> Suconic <
> > > > > > > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> > I have a branch where I'm using a
> single branch:
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> >
> https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> > The only concern I have so far is
> that any time I build, I
> > > > > > > > > > > > > get a
> > > > > > > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > > > > > > >> > (use "git add <file>..." to update
> what will be committed)
> > > > > > > > > > > > > > > > > >> > (use "git checkout -- <file>..." to
> discard changes in
> > > > > > > > > > > > > working
> > > > > > > > > > > > > > > > directory)
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> > typechange:
> content/schema/core/activemq-core.xsd
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> > Although I would consider that anyone
> would check stuff before
> > > > > > > > > > > > > > > > committing..
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin
> Bertram <
> > > > > > > > > > > > > jbertram@apache.org>
> > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > >> > > If it's simpler and documented that
> sounds like a win to me.
> > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM
> Robbie Gemmell <
> > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47,
> Clebert Suconic <
> > > > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM
> Robbie Gemmell <
> > > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and
> what I've seen other
> > > > > > > > > > > > > > > > > >> > > > > > projects do, I find it
> simpler overall.
> > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > > > > > > >> > > > > I'm all +10000000 on this...
> what we need to change on
> > > > > > > > > > > > > infra.
> > > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > > >> > > > > Can we keep the history from
> master
> > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > >> > > > We wouldnt need to change much to
> get everything on the
> > > > > > > > > > > > > same
> > > > > > > > > > > > > > > > branch I
> > > > > > > > > > > > > > > > > >> > > > dont think, and it seems like we
> can do so without infra:
> > > > > > > > > > > > > I
> > > > > > > > > > > > > > > > just tried
> > > > > > > > > > > > > > > > > >> > > > on your last commit as a test and
> was able to force-push
> > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > >> > > > So basically it seems it needs
> something like: repopulate
> > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > > >> > > > branch (or a test branch) with
> the master history locally,
> > > > > > > > > > > > > > > > simplify
> > > > > > > > > > > > > > > > > >> > > > the build script to only build
> and nothing else, fix up
> > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > .gitignore
> > > > > > > > > > > > > > > > > >> > > > file appropriately, build things,
> commit, and [force]
> > > > > > > > > > > > > push.
> > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > >> > > > Assuming of course others agree
> that it is what should
> > > > > > > > > > > > > happen?
> > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > > >> > --
> > > > > > > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > >
> > > > > > > > > > > > --
> > > > > > > > > > > > Clebert Suconic
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > --
> > > > > > > > > > Clebert Suconic
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Clebert Suconic
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Clebert Suconic
> > > >
> > > >
> > > >
> > > > --
> > > > Clebert Suconic
> > >
> > >
> > >
> > > --
> > > Clebert Suconic
> >
> >
> >
> > --
> > Clebert Suconic
>
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
Given the site is readily testable locally with its build tool, and
how small+infrequent most updates to it are, I'd remove the branch
personally. Seems likely to be stale most of the time, and its easily
created again later if truly needed.
On Tue, 8 Oct 2019 at 20:49, Clebert Suconic <cl...@gmail.com> wrote:
>
> There was a PR updating the navbar. It was an include and touched a
> lot of files.
>
> So I tested with the "staging" feature. and it works like a charm.
>
> https://activemq.staged.apache.org
>
>
> Should I keep the branch staging for future reference if anyone ever
> wants to do testing again?
>
> What you guys think?
>
> On Tue, Oct 8, 2019 at 1:54 PM Clebert Suconic
> <cl...@gmail.com> wrote:
> >
> > There was also a branch from the early days when Michal and Martyn
> > were working on the website called "michaelandrepearce-patch-1-1"
> > which I rempved and made a copy on my fork.
> >
> > Now there's only one branch which is called master.
> >
> > We could now use the staging feature on future releases :)
> >
> > On Tue, Oct 8, 2019 at 1:41 PM Clebert Suconic
> > <cl...@gmail.com> wrote:
> > >
> > > I have removed it...
> > >
> > > (Just in case, I made a copy of it on my fork, just in case, which I
> > > will remove it some day)
> > >
> > > On Tue, Oct 8, 2019 at 1:40 PM Clebert Suconic
> > > <cl...@gmail.com> wrote:
> > > >
> > > > I was actually going to ask if we can remove it...
> > > >
> > > > I believe I have authorization to remove the asf-site myself.
> > > >
> > > > On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > >
> > > > > Great. I'd suggest deleting the asf-site branch now its unused, or
> > > > > asking INFRA if it cant be removed, and closing the original infra
> > > > > JIRA.
> > > > >
> > > > > On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > >
> > > > > > everything is on master now!!!
> > > > > >
> > > > > > I just did one dumb change to make sure the update worked, and it
> > > > > > did... everything is on master now.
> > > > > >
> > > > > > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > > >
> > > > > > > Or, alternatively, instead of updating the contents of asf-site and
> > > > > > > removing master, per the JIRA discussion we could change the site to
> > > > > > > be published from master instead of asf-site ourselves by adding a
> > > > > > > .asf.yaml file:
> > > > > > > https://issues.apache.org/jira/browse/INFRA-19235
> > > > > > >
> > > > > > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > > > >
> > > > > > > > We can update the contents of the asf-site branch to suit our needs,
> > > > > > > > the only requirement from infra is that the published content is in
> > > > > > > > the content dir. The only thing we needed them to do would be change
> > > > > > > > the default branch.
> > > > > > > >
> > > > > > > > Daniel will be talking about the new abilities offered by the more
> > > > > > > > recently added asf.yaml stuff which can do various other things and
> > > > > > > > override the existing website publishing stuff:
> > > > > > > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > > > > > >
> > > > > > > > We can certainly look to add more of the stuff like staging etc if
> > > > > > > > folks wanted, but I'd say its seperate from this change, and I dont
> > > > > > > > personally see a real need for it right now.
> > > > > > > >
> > > > > > > > Robbie
> > > > > > > >
> > > > > > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > > > > > >
> > > > > > > > > > I'm not sure I see a need for creating another branch or asking infra
> > > > > > > > > > to assist in the update itself. We are effectively just adding the
> > > > > > > > > > source and history to the asf-site branch, which is where the site
> > > > > > > > > > bits have to go, byt overwriting it, which we can do. The only thing
> > > > > > > > > > we should really need infra to do is change the default branch setting
> > > > > > > > > > to asf-site after the update is done, and then master can be removed.
> > > > > > > > >
> > > > > > > > > We could certainly do that. I just wanted to make sure Infra would
> > > > > > > > > have no issues with the change.
> > > > > > > > >
> > > > > > > > > Daniel is talking about a yaml file I never heard about, even talking
> > > > > > > > > about staging website (which could be useful as part of our release
> > > > > > > > > processes).
> > > > > > > > >
> > > > > > > > > I'm getting confused through the JIRA. and I need help :)
> > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > > > > > > >
> > > > > > > > > > > I will do the right thing. I will create a branch called future-master.
> > > > > > > > > > > And ask infra to update everything.
> > > > > > > > > > >
> > > > > > > > > > > I will send a separate thread with a clear title.
> > > > > > > > > > >
> > > > > > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > > > > > > > > > > wrote:
> > > > > > > > > > >
> > > > > > > > > > > > A necessary change would be updating the readme to describe the
> > > > > > > > > > > > updated build + publish process. I've raised a PR against your test
> > > > > > > > > > > > branch with suggested changes:
> > > > > > > > > > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > > > > > >
> > > > > > > > > > > > Robbie
> > > > > > > > > > > >
> > > > > > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > > > > > > > > > > wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > > > > > > > > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > > > > > > > > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > > > > > > > > > > otherwise, so its clear when the change might happen and that lazy
> > > > > > > > > > > > > consensus can be taken as only a few folks have commented on this
> > > > > > > > > > > > > thread.
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > > > > > > > > > > wrote:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Should we move it then ?
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > > What you did is just what the exiting build script did, so that
> > > > > > > > > > > > should
> > > > > > > > > > > > > > > be fine if it was previously. I tried with and without the
> > > > > > > > > > > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > > > > > > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > > > > > > > > > > caused it.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Playing with a single branch would make it a lot easier. It
> > > > > > > > > > > > bothers me
> > > > > > > > > > > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > > > > > > > > > > files
> > > > > > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > > > > > > > > > > though ;) )
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > > > > > Move it.
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > > > > > > > > > > ever
> > > > > > > > > > > > > > > > >> seen the 'typechange' file status before.
> > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > > > > > > > > > > symlink, and
> > > > > > > > > > > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > > > > > > > > > > when
> > > > > > > > > > > > > > > > >> such link is replaced with an actual file. If I do that
> > > > > > > > > > > > deliberately,
> > > > > > > > > > > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > > > > > > > > > > happen
> > > > > > > > > > > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > > > > > > > > > > copied
> > > > > > > > > > > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > > > > > > > > > > >> 'content' dir your subsequent status is showing as being
> > > > > > > > > > > > updated?
> > > > > > > > > > > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> > The only concern I have so far is that any time I build, I
> > > > > > > > > > > > get a
> > > > > > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > > > > > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > > > > > > > > > > working
> > > > > > > > > > > > > > > directory)
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > > > > > > > > > > committing..
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > > > > > > > > > > jbertram@apache.org>
> > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > > > > > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > > > > > > > > > > infra.
> > > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > > >> > > > > Can we keep the history from master
> > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > > > > > > > > > > same
> > > > > > > > > > > > > > > branch I
> > > > > > > > > > > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > > > > > > > > > > I
> > > > > > > > > > > > > > > just tried
> > > > > > > > > > > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > > > > > > > > > > the
> > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > > > > > > > > > > the
> > > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > > > > > > > > > > simplify
> > > > > > > > > > > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > > > > > > > > > > the
> > > > > > > > > > > > > > > .gitignore
> > > > > > > > > > > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > > > > > > > > > > push.
> > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > >> > > > Assuming of course others agree that it is what should
> > > > > > > > > > > > happen?
> > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > > >> > --
> > > > > > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > --
> > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > >
> > > > > > > > > > > --
> > > > > > > > > > > Clebert Suconic
> > > > > > > > >
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > --
> > > > > > > > > Clebert Suconic
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > > >
> > > >
> > > >
> > > > --
> > > > Clebert Suconic
> > >
> > >
> > >
> > > --
> > > Clebert Suconic
> >
> >
> >
> > --
> > Clebert Suconic
>
>
>
> --
> Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
There was a PR updating the navbar. It was an include and touched a
lot of files.
So I tested with the "staging" feature. and it works like a charm.
https://activemq.staged.apache.org
Should I keep the branch staging for future reference if anyone ever
wants to do testing again?
What you guys think?
On Tue, Oct 8, 2019 at 1:54 PM Clebert Suconic
<cl...@gmail.com> wrote:
>
> There was also a branch from the early days when Michal and Martyn
> were working on the website called "michaelandrepearce-patch-1-1"
> which I rempved and made a copy on my fork.
>
> Now there's only one branch which is called master.
>
> We could now use the staging feature on future releases :)
>
> On Tue, Oct 8, 2019 at 1:41 PM Clebert Suconic
> <cl...@gmail.com> wrote:
> >
> > I have removed it...
> >
> > (Just in case, I made a copy of it on my fork, just in case, which I
> > will remove it some day)
> >
> > On Tue, Oct 8, 2019 at 1:40 PM Clebert Suconic
> > <cl...@gmail.com> wrote:
> > >
> > > I was actually going to ask if we can remove it...
> > >
> > > I believe I have authorization to remove the asf-site myself.
> > >
> > > On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > >
> > > > Great. I'd suggest deleting the asf-site branch now its unused, or
> > > > asking INFRA if it cant be removed, and closing the original infra
> > > > JIRA.
> > > >
> > > > On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <cl...@gmail.com> wrote:
> > > > >
> > > > > everything is on master now!!!
> > > > >
> > > > > I just did one dumb change to make sure the update worked, and it
> > > > > did... everything is on master now.
> > > > >
> > > > > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > >
> > > > > > Or, alternatively, instead of updating the contents of asf-site and
> > > > > > removing master, per the JIRA discussion we could change the site to
> > > > > > be published from master instead of asf-site ourselves by adding a
> > > > > > .asf.yaml file:
> > > > > > https://issues.apache.org/jira/browse/INFRA-19235
> > > > > >
> > > > > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > > >
> > > > > > > We can update the contents of the asf-site branch to suit our needs,
> > > > > > > the only requirement from infra is that the published content is in
> > > > > > > the content dir. The only thing we needed them to do would be change
> > > > > > > the default branch.
> > > > > > >
> > > > > > > Daniel will be talking about the new abilities offered by the more
> > > > > > > recently added asf.yaml stuff which can do various other things and
> > > > > > > override the existing website publishing stuff:
> > > > > > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > > > > >
> > > > > > > We can certainly look to add more of the stuff like staging etc if
> > > > > > > folks wanted, but I'd say its seperate from this change, and I dont
> > > > > > > personally see a real need for it right now.
> > > > > > >
> > > > > > > Robbie
> > > > > > >
> > > > > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > > > >
> > > > > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > I'm not sure I see a need for creating another branch or asking infra
> > > > > > > > > to assist in the update itself. We are effectively just adding the
> > > > > > > > > source and history to the asf-site branch, which is where the site
> > > > > > > > > bits have to go, byt overwriting it, which we can do. The only thing
> > > > > > > > > we should really need infra to do is change the default branch setting
> > > > > > > > > to asf-site after the update is done, and then master can be removed.
> > > > > > > >
> > > > > > > > We could certainly do that. I just wanted to make sure Infra would
> > > > > > > > have no issues with the change.
> > > > > > > >
> > > > > > > > Daniel is talking about a yaml file I never heard about, even talking
> > > > > > > > about staging website (which could be useful as part of our release
> > > > > > > > processes).
> > > > > > > >
> > > > > > > > I'm getting confused through the JIRA. and I need help :)
> > > > > > > >
> > > > > > > > >
> > > > > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > > > > > >
> > > > > > > > > > I will do the right thing. I will create a branch called future-master.
> > > > > > > > > > And ask infra to update everything.
> > > > > > > > > >
> > > > > > > > > > I will send a separate thread with a clear title.
> > > > > > > > > >
> > > > > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > > > > > > > > > wrote:
> > > > > > > > > >
> > > > > > > > > > > A necessary change would be updating the readme to describe the
> > > > > > > > > > > updated build + publish process. I've raised a PR against your test
> > > > > > > > > > > branch with suggested changes:
> > > > > > > > > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > > > > >
> > > > > > > > > > > Robbie
> > > > > > > > > > >
> > > > > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > > > > > > > > > wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > > > > > > > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > > > > > > > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > > > > > > > > > otherwise, so its clear when the change might happen and that lazy
> > > > > > > > > > > > consensus can be taken as only a few folks have commented on this
> > > > > > > > > > > > thread.
> > > > > > > > > > > >
> > > > > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > > > > > > > > > wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > Should we move it then ?
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > > What you did is just what the exiting build script did, so that
> > > > > > > > > > > should
> > > > > > > > > > > > > > be fine if it was previously. I tried with and without the
> > > > > > > > > > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > > > > > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > > > > > > > > > caused it.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Playing with a single branch would make it a lot easier. It
> > > > > > > > > > > bothers me
> > > > > > > > > > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > > > > > > > > > files
> > > > > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > > > > > > > > > though ;) )
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > > > > Move it.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > > > > > > > > > ever
> > > > > > > > > > > > > > > >> seen the 'typechange' file status before.
> > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > > > > > > > > > symlink, and
> > > > > > > > > > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > > > > > > > > > when
> > > > > > > > > > > > > > > >> such link is replaced with an actual file. If I do that
> > > > > > > > > > > deliberately,
> > > > > > > > > > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > > > > > > > > > happen
> > > > > > > > > > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > > > > > > > > > copied
> > > > > > > > > > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > > > > > > > > > >> 'content' dir your subsequent status is showing as being
> > > > > > > > > > > updated?
> > > > > > > > > > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> > The only concern I have so far is that any time I build, I
> > > > > > > > > > > get a
> > > > > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > > > > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > > > > > > > > > working
> > > > > > > > > > > > > > directory)
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > > > > > > > > > committing..
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > > > > > > > > > jbertram@apache.org>
> > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > > > > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > > > > > > > > > infra.
> > > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > > >> > > > > Can we keep the history from master
> > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > > > > > > > > > same
> > > > > > > > > > > > > > branch I
> > > > > > > > > > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > > > > > > > > > I
> > > > > > > > > > > > > > just tried
> > > > > > > > > > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > > > > > > > > > the
> > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > > > > > > > > > the
> > > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > > > > > > > > > simplify
> > > > > > > > > > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > > > > > > > > > the
> > > > > > > > > > > > > > .gitignore
> > > > > > > > > > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > > > > > > > > > push.
> > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > >> > > > Assuming of course others agree that it is what should
> > > > > > > > > > > happen?
> > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > > >> > --
> > > > > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > >
> > > > > > > > > > > > > --
> > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > >
> > > > > > > > > > --
> > > > > > > > > > Clebert Suconic
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > --
> > > > > > > > Clebert Suconic
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Clebert Suconic
> > >
> > >
> > >
> > > --
> > > Clebert Suconic
> >
> >
> >
> > --
> > Clebert Suconic
>
>
>
> --
> Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
There was also a branch from the early days when Michal and Martyn
were working on the website called "michaelandrepearce-patch-1-1"
which I rempved and made a copy on my fork.
Now there's only one branch which is called master.
We could now use the staging feature on future releases :)
On Tue, Oct 8, 2019 at 1:41 PM Clebert Suconic
<cl...@gmail.com> wrote:
>
> I have removed it...
>
> (Just in case, I made a copy of it on my fork, just in case, which I
> will remove it some day)
>
> On Tue, Oct 8, 2019 at 1:40 PM Clebert Suconic
> <cl...@gmail.com> wrote:
> >
> > I was actually going to ask if we can remove it...
> >
> > I believe I have authorization to remove the asf-site myself.
> >
> > On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > >
> > > Great. I'd suggest deleting the asf-site branch now its unused, or
> > > asking INFRA if it cant be removed, and closing the original infra
> > > JIRA.
> > >
> > > On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <cl...@gmail.com> wrote:
> > > >
> > > > everything is on master now!!!
> > > >
> > > > I just did one dumb change to make sure the update worked, and it
> > > > did... everything is on master now.
> > > >
> > > > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > >
> > > > > Or, alternatively, instead of updating the contents of asf-site and
> > > > > removing master, per the JIRA discussion we could change the site to
> > > > > be published from master instead of asf-site ourselves by adding a
> > > > > .asf.yaml file:
> > > > > https://issues.apache.org/jira/browse/INFRA-19235
> > > > >
> > > > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > >
> > > > > > We can update the contents of the asf-site branch to suit our needs,
> > > > > > the only requirement from infra is that the published content is in
> > > > > > the content dir. The only thing we needed them to do would be change
> > > > > > the default branch.
> > > > > >
> > > > > > Daniel will be talking about the new abilities offered by the more
> > > > > > recently added asf.yaml stuff which can do various other things and
> > > > > > override the existing website publishing stuff:
> > > > > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > > > >
> > > > > > We can certainly look to add more of the stuff like staging etc if
> > > > > > folks wanted, but I'd say its seperate from this change, and I dont
> > > > > > personally see a real need for it right now.
> > > > > >
> > > > > > Robbie
> > > > > >
> > > > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > > >
> > > > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > > > >
> > > > > > > > I'm not sure I see a need for creating another branch or asking infra
> > > > > > > > to assist in the update itself. We are effectively just adding the
> > > > > > > > source and history to the asf-site branch, which is where the site
> > > > > > > > bits have to go, byt overwriting it, which we can do. The only thing
> > > > > > > > we should really need infra to do is change the default branch setting
> > > > > > > > to asf-site after the update is done, and then master can be removed.
> > > > > > >
> > > > > > > We could certainly do that. I just wanted to make sure Infra would
> > > > > > > have no issues with the change.
> > > > > > >
> > > > > > > Daniel is talking about a yaml file I never heard about, even talking
> > > > > > > about staging website (which could be useful as part of our release
> > > > > > > processes).
> > > > > > >
> > > > > > > I'm getting confused through the JIRA. and I need help :)
> > > > > > >
> > > > > > > >
> > > > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > I will do the right thing. I will create a branch called future-master.
> > > > > > > > > And ask infra to update everything.
> > > > > > > > >
> > > > > > > > > I will send a separate thread with a clear title.
> > > > > > > > >
> > > > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > > > > > > > > wrote:
> > > > > > > > >
> > > > > > > > > > A necessary change would be updating the readme to describe the
> > > > > > > > > > updated build + publish process. I've raised a PR against your test
> > > > > > > > > > branch with suggested changes:
> > > > > > > > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > > > >
> > > > > > > > > > Robbie
> > > > > > > > > >
> > > > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > > > > > > > > wrote:
> > > > > > > > > > >
> > > > > > > > > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > > > > > > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > > > > > > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > > > > > > > > otherwise, so its clear when the change might happen and that lazy
> > > > > > > > > > > consensus can be taken as only a few folks have commented on this
> > > > > > > > > > > thread.
> > > > > > > > > > >
> > > > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > > > > > > > > wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > Should we move it then ?
> > > > > > > > > > > >
> > > > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > > What you did is just what the exiting build script did, so that
> > > > > > > > > > should
> > > > > > > > > > > > > be fine if it was previously. I tried with and without the
> > > > > > > > > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > > > > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > > > > > > > > caused it.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Playing with a single branch would make it a lot easier. It
> > > > > > > > > > bothers me
> > > > > > > > > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > > > > > > > > files
> > > > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > > > > > > > > though ;) )
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > > > Move it.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > > > > > > > > ever
> > > > > > > > > > > > > > >> seen the 'typechange' file status before.
> > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > > > > > > > > symlink, and
> > > > > > > > > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > > > > > > > > when
> > > > > > > > > > > > > > >> such link is replaced with an actual file. If I do that
> > > > > > > > > > deliberately,
> > > > > > > > > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > > > > > > > > happen
> > > > > > > > > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > > > > > > > > copied
> > > > > > > > > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > > > > > > > > >> 'content' dir your subsequent status is showing as being
> > > > > > > > > > updated?
> > > > > > > > > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > > > >>
> > > > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> > The only concern I have so far is that any time I build, I
> > > > > > > > > > get a
> > > > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > > > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > > > > > > > > working
> > > > > > > > > > > > > directory)
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > > > > > > > > committing..
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > > > > > > > > jbertram@apache.org>
> > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > > > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > > > > > > > > infra.
> > > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > > >> > > > > Can we keep the history from master
> > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > > > > > > > > same
> > > > > > > > > > > > > branch I
> > > > > > > > > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > > > > > > > > I
> > > > > > > > > > > > > just tried
> > > > > > > > > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > > > > > > > > the
> > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > > > > > > > > the
> > > > > > > > > > > > > asf-site
> > > > > > > > > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > > > > > > > > simplify
> > > > > > > > > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > > > > > > > > the
> > > > > > > > > > > > > .gitignore
> > > > > > > > > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > > > > > > > > push.
> > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > >> > > > Assuming of course others agree that it is what should
> > > > > > > > > > happen?
> > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> >
> > > > > > > > > > > > > > >> > --
> > > > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > --
> > > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > --
> > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > >
> > > > > > > > > > > > --
> > > > > > > > > > > > Clebert Suconic
> > > > > > > > > >
> > > > > > > > > --
> > > > > > > > > Clebert Suconic
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Clebert Suconic
> > > >
> > > >
> > > >
> > > > --
> > > > Clebert Suconic
> >
> >
> >
> > --
> > Clebert Suconic
>
>
>
> --
> Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
I have removed it...
(Just in case, I made a copy of it on my fork, just in case, which I
will remove it some day)
On Tue, Oct 8, 2019 at 1:40 PM Clebert Suconic
<cl...@gmail.com> wrote:
>
> I was actually going to ask if we can remove it...
>
> I believe I have authorization to remove the asf-site myself.
>
> On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <ro...@gmail.com> wrote:
> >
> > Great. I'd suggest deleting the asf-site branch now its unused, or
> > asking INFRA if it cant be removed, and closing the original infra
> > JIRA.
> >
> > On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <cl...@gmail.com> wrote:
> > >
> > > everything is on master now!!!
> > >
> > > I just did one dumb change to make sure the update worked, and it
> > > did... everything is on master now.
> > >
> > > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > >
> > > > Or, alternatively, instead of updating the contents of asf-site and
> > > > removing master, per the JIRA discussion we could change the site to
> > > > be published from master instead of asf-site ourselves by adding a
> > > > .asf.yaml file:
> > > > https://issues.apache.org/jira/browse/INFRA-19235
> > > >
> > > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <ro...@gmail.com> wrote:
> > > > >
> > > > > We can update the contents of the asf-site branch to suit our needs,
> > > > > the only requirement from infra is that the published content is in
> > > > > the content dir. The only thing we needed them to do would be change
> > > > > the default branch.
> > > > >
> > > > > Daniel will be talking about the new abilities offered by the more
> > > > > recently added asf.yaml stuff which can do various other things and
> > > > > override the existing website publishing stuff:
> > > > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > > >
> > > > > We can certainly look to add more of the stuff like staging etc if
> > > > > folks wanted, but I'd say its seperate from this change, and I dont
> > > > > personally see a real need for it right now.
> > > > >
> > > > > Robbie
> > > > >
> > > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > >
> > > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > > >
> > > > > > > I'm not sure I see a need for creating another branch or asking infra
> > > > > > > to assist in the update itself. We are effectively just adding the
> > > > > > > source and history to the asf-site branch, which is where the site
> > > > > > > bits have to go, byt overwriting it, which we can do. The only thing
> > > > > > > we should really need infra to do is change the default branch setting
> > > > > > > to asf-site after the update is done, and then master can be removed.
> > > > > >
> > > > > > We could certainly do that. I just wanted to make sure Infra would
> > > > > > have no issues with the change.
> > > > > >
> > > > > > Daniel is talking about a yaml file I never heard about, even talking
> > > > > > about staging website (which could be useful as part of our release
> > > > > > processes).
> > > > > >
> > > > > > I'm getting confused through the JIRA. and I need help :)
> > > > > >
> > > > > > >
> > > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > > > >
> > > > > > > > I will do the right thing. I will create a branch called future-master.
> > > > > > > > And ask infra to update everything.
> > > > > > > >
> > > > > > > > I will send a separate thread with a clear title.
> > > > > > > >
> > > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > > > > > > > wrote:
> > > > > > > >
> > > > > > > > > A necessary change would be updating the readme to describe the
> > > > > > > > > updated build + publish process. I've raised a PR against your test
> > > > > > > > > branch with suggested changes:
> > > > > > > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > > >
> > > > > > > > > Robbie
> > > > > > > > >
> > > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > > > > > > > wrote:
> > > > > > > > > >
> > > > > > > > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > > > > > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > > > > > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > > > > > > > otherwise, so its clear when the change might happen and that lazy
> > > > > > > > > > consensus can be taken as only a few folks have commented on this
> > > > > > > > > > thread.
> > > > > > > > > >
> > > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > > > > > > > wrote:
> > > > > > > > > > >
> > > > > > > > > > > Should we move it then ?
> > > > > > > > > > >
> > > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > wrote:
> > > > > > > > > > >
> > > > > > > > > > > > What you did is just what the exiting build script did, so that
> > > > > > > > > should
> > > > > > > > > > > > be fine if it was previously. I tried with and without the
> > > > > > > > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > > > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > > >
> > > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > > >
> > > > > > > > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > > > > > > > caused it.
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > > Playing with a single branch would make it a lot easier. It
> > > > > > > > > bothers me
> > > > > > > > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > > > > > > > files
> > > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > > > > > > > though ;) )
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > > Move it.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > > >>
> > > > > > > > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > > > > > > > ever
> > > > > > > > > > > > > >> seen the 'typechange' file status before.
> > > > > > > > > > > > > >>
> > > > > > > > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > > > > > > > symlink, and
> > > > > > > > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > > > > > > > when
> > > > > > > > > > > > > >> such link is replaced with an actual file. If I do that
> > > > > > > > > deliberately,
> > > > > > > > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > > > > > > > happen
> > > > > > > > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > > > > > > > copied
> > > > > > > > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > > > > > > > >> 'content' dir your subsequent status is showing as being
> > > > > > > > > updated?
> > > > > > > > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > > > > > > > >>
> > > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > > >>
> > > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> > The only concern I have so far is that any time I build, I
> > > > > > > > > get a
> > > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > > > > > > > working
> > > > > > > > > > > > directory)
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > > > > > > > committing..
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > > > > > > > jbertram@apache.org>
> > > > > > > > > > > > wrote:
> > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > > >> > >
> > > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > > > > > > > infra.
> > > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > > >> > > > > Can we keep the history from master
> > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > > > > > > > same
> > > > > > > > > > > > branch I
> > > > > > > > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > > > > > > > I
> > > > > > > > > > > > just tried
> > > > > > > > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > > > > > > > the
> > > > > > > > > > > > asf-site
> > > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > > > > > > > the
> > > > > > > > > > > > asf-site
> > > > > > > > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > > > > > > > simplify
> > > > > > > > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > > > > > > > the
> > > > > > > > > > > > .gitignore
> > > > > > > > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > > > > > > > push.
> > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > >> > > > Assuming of course others agree that it is what should
> > > > > > > > > happen?
> > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > > >> > > >
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> >
> > > > > > > > > > > > > >> > --
> > > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > --
> > > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > > --
> > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > >
> > > > > > > > > > > --
> > > > > > > > > > > Clebert Suconic
> > > > > > > > >
> > > > > > > > --
> > > > > > > > Clebert Suconic
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > >
> > >
> > >
> > > --
> > > Clebert Suconic
>
>
>
> --
> Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
I was actually going to ask if we can remove it...
I believe I have authorization to remove the asf-site myself.
On Tue, Oct 8, 2019 at 11:38 AM Robbie Gemmell <ro...@gmail.com> wrote:
>
> Great. I'd suggest deleting the asf-site branch now its unused, or
> asking INFRA if it cant be removed, and closing the original infra
> JIRA.
>
> On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <cl...@gmail.com> wrote:
> >
> > everything is on master now!!!
> >
> > I just did one dumb change to make sure the update worked, and it
> > did... everything is on master now.
> >
> > On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > >
> > > Or, alternatively, instead of updating the contents of asf-site and
> > > removing master, per the JIRA discussion we could change the site to
> > > be published from master instead of asf-site ourselves by adding a
> > > .asf.yaml file:
> > > https://issues.apache.org/jira/browse/INFRA-19235
> > >
> > > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <ro...@gmail.com> wrote:
> > > >
> > > > We can update the contents of the asf-site branch to suit our needs,
> > > > the only requirement from infra is that the published content is in
> > > > the content dir. The only thing we needed them to do would be change
> > > > the default branch.
> > > >
> > > > Daniel will be talking about the new abilities offered by the more
> > > > recently added asf.yaml stuff which can do various other things and
> > > > override the existing website publishing stuff:
> > > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > > >
> > > > We can certainly look to add more of the stuff like staging etc if
> > > > folks wanted, but I'd say its seperate from this change, and I dont
> > > > personally see a real need for it right now.
> > > >
> > > > Robbie
> > > >
> > > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <cl...@gmail.com> wrote:
> > > > >
> > > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > > >
> > > > > > I'm not sure I see a need for creating another branch or asking infra
> > > > > > to assist in the update itself. We are effectively just adding the
> > > > > > source and history to the asf-site branch, which is where the site
> > > > > > bits have to go, byt overwriting it, which we can do. The only thing
> > > > > > we should really need infra to do is change the default branch setting
> > > > > > to asf-site after the update is done, and then master can be removed.
> > > > >
> > > > > We could certainly do that. I just wanted to make sure Infra would
> > > > > have no issues with the change.
> > > > >
> > > > > Daniel is talking about a yaml file I never heard about, even talking
> > > > > about staging website (which could be useful as part of our release
> > > > > processes).
> > > > >
> > > > > I'm getting confused through the JIRA. and I need help :)
> > > > >
> > > > > >
> > > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > > >
> > > > > > > I will do the right thing. I will create a branch called future-master.
> > > > > > > And ask infra to update everything.
> > > > > > >
> > > > > > > I will send a separate thread with a clear title.
> > > > > > >
> > > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > > > > > > wrote:
> > > > > > >
> > > > > > > > A necessary change would be updating the readme to describe the
> > > > > > > > updated build + publish process. I've raised a PR against your test
> > > > > > > > branch with suggested changes:
> > > > > > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > > >
> > > > > > > > Robbie
> > > > > > > >
> > > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > > > > > > wrote:
> > > > > > > > >
> > > > > > > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > > > > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > > > > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > > > > > > otherwise, so its clear when the change might happen and that lazy
> > > > > > > > > consensus can be taken as only a few folks have commented on this
> > > > > > > > > thread.
> > > > > > > > >
> > > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > > > > > > wrote:
> > > > > > > > > >
> > > > > > > > > > Should we move it then ?
> > > > > > > > > >
> > > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > wrote:
> > > > > > > > > >
> > > > > > > > > > > What you did is just what the exiting build script did, so that
> > > > > > > > should
> > > > > > > > > > > be fine if it was previously. I tried with and without the
> > > > > > > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > > >
> > > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > > >
> > > > > > > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > > > > > > caused it.
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > > Playing with a single branch would make it a lot easier. It
> > > > > > > > bothers me
> > > > > > > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > > > > > > files
> > > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > > > > > > though ;) )
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > > >
> > > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > > >
> > > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > > >
> > > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > > Move it.
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > > Moved it back.
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > >
> > > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > > >>
> > > > > > > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > > > > > > ever
> > > > > > > > > > > > >> seen the 'typechange' file status before.
> > > > > > > > > > > > >>
> > > > > > > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > > > > > > symlink, and
> > > > > > > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > > > > > > when
> > > > > > > > > > > > >> such link is replaced with an actual file. If I do that
> > > > > > > > deliberately,
> > > > > > > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > > > > > > happen
> > > > > > > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > > > > > > copied
> > > > > > > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > > > > > > >> 'content' dir your subsequent status is showing as being
> > > > > > > > updated?
> > > > > > > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > > > > > > >>
> > > > > > > > > > > > >> Robbie
> > > > > > > > > > > > >>
> > > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> > The only concern I have so far is that any time I build, I
> > > > > > > > get a
> > > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > > > > > > working
> > > > > > > > > > > directory)
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > > > > > > committing..
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > > > > > > jbertram@apache.org>
> > > > > > > > > > > wrote:
> > > > > > > > > > > > >> > >
> > > > > > > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > > > > > > >> > >
> > > > > > > > > > > > >> > >
> > > > > > > > > > > > >> > > Justin
> > > > > > > > > > > > >> > >
> > > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > > >> > >
> > > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > > > > > > infra.
> > > > > > > > > > > > >> > > > >
> > > > > > > > > > > > >> > > > > Can we keep the history from master
> > > > > > > > > > > > >> > > >
> > > > > > > > > > > > >> > > >
> > > > > > > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > > > > > > same
> > > > > > > > > > > branch I
> > > > > > > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > > > > > > I
> > > > > > > > > > > just tried
> > > > > > > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > > > > > > the
> > > > > > > > > > > asf-site
> > > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > > >> > > >
> > > > > > > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > > > > > > the
> > > > > > > > > > > asf-site
> > > > > > > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > > > > > > simplify
> > > > > > > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > > > > > > the
> > > > > > > > > > > .gitignore
> > > > > > > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > > > > > > push.
> > > > > > > > > > > > >> > > >
> > > > > > > > > > > > >> > > > Assuming of course others agree that it is what should
> > > > > > > > happen?
> > > > > > > > > > > > >> > > >
> > > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > > >> > > >
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> >
> > > > > > > > > > > > >> > --
> > > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > > >
> > > > > > > > > > > > > --
> > > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > > --
> > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > >
> > > > > > > > > > --
> > > > > > > > > > Clebert Suconic
> > > > > > > >
> > > > > > > --
> > > > > > > Clebert Suconic
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Clebert Suconic
> >
> >
> >
> > --
> > Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
Great. I'd suggest deleting the asf-site branch now its unused, or
asking INFRA if it cant be removed, and closing the original infra
JIRA.
On Tue, 8 Oct 2019 at 16:32, Clebert Suconic <cl...@gmail.com> wrote:
>
> everything is on master now!!!
>
> I just did one dumb change to make sure the update worked, and it
> did... everything is on master now.
>
> On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <ro...@gmail.com> wrote:
> >
> > Or, alternatively, instead of updating the contents of asf-site and
> > removing master, per the JIRA discussion we could change the site to
> > be published from master instead of asf-site ourselves by adding a
> > .asf.yaml file:
> > https://issues.apache.org/jira/browse/INFRA-19235
> >
> > On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <ro...@gmail.com> wrote:
> > >
> > > We can update the contents of the asf-site branch to suit our needs,
> > > the only requirement from infra is that the published content is in
> > > the content dir. The only thing we needed them to do would be change
> > > the default branch.
> > >
> > > Daniel will be talking about the new abilities offered by the more
> > > recently added asf.yaml stuff which can do various other things and
> > > override the existing website publishing stuff:
> > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> > >
> > > We can certainly look to add more of the stuff like staging etc if
> > > folks wanted, but I'd say its seperate from this change, and I dont
> > > personally see a real need for it right now.
> > >
> > > Robbie
> > >
> > > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <cl...@gmail.com> wrote:
> > > >
> > > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > > >
> > > > > I'm not sure I see a need for creating another branch or asking infra
> > > > > to assist in the update itself. We are effectively just adding the
> > > > > source and history to the asf-site branch, which is where the site
> > > > > bits have to go, byt overwriting it, which we can do. The only thing
> > > > > we should really need infra to do is change the default branch setting
> > > > > to asf-site after the update is done, and then master can be removed.
> > > >
> > > > We could certainly do that. I just wanted to make sure Infra would
> > > > have no issues with the change.
> > > >
> > > > Daniel is talking about a yaml file I never heard about, even talking
> > > > about staging website (which could be useful as part of our release
> > > > processes).
> > > >
> > > > I'm getting confused through the JIRA. and I need help :)
> > > >
> > > > >
> > > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> > > > > >
> > > > > > I will do the right thing. I will create a branch called future-master.
> > > > > > And ask infra to update everything.
> > > > > >
> > > > > > I will send a separate thread with a clear title.
> > > > > >
> > > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > > > > > wrote:
> > > > > >
> > > > > > > A necessary change would be updating the readme to describe the
> > > > > > > updated build + publish process. I've raised a PR against your test
> > > > > > > branch with suggested changes:
> > > > > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > > >
> > > > > > > Robbie
> > > > > > >
> > > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > > > > > wrote:
> > > > > > > >
> > > > > > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > > > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > > > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > > > > > otherwise, so its clear when the change might happen and that lazy
> > > > > > > > consensus can be taken as only a few folks have commented on this
> > > > > > > > thread.
> > > > > > > >
> > > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > > > > > wrote:
> > > > > > > > >
> > > > > > > > > Should we move it then ?
> > > > > > > > >
> > > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > wrote:
> > > > > > > > >
> > > > > > > > > > What you did is just what the exiting build script did, so that
> > > > > > > should
> > > > > > > > > > be fine if it was previously. I tried with and without the
> > > > > > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > > > > > you now dont, but at least its working now.
> > > > > > > > > >
> > > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > wrote:
> > > > > > > > > > >
> > > > > > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > > >
> > > > > > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > > > > > caused it.
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > Playing with a single branch would make it a lot easier. It
> > > > > > > bothers me
> > > > > > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > > > > > files
> > > > > > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > > > > > though ;) )
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > > >
> > > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > > >
> > > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > > >
> > > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > > Move it.
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > > Checkout the test branch
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > > Moved it back.
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > >
> > > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > > >>
> > > > > > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > > > > > ever
> > > > > > > > > > > >> seen the 'typechange' file status before.
> > > > > > > > > > > >>
> > > > > > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > > > > > symlink, and
> > > > > > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > > > > > when
> > > > > > > > > > > >> such link is replaced with an actual file. If I do that
> > > > > > > deliberately,
> > > > > > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > > > > > happen
> > > > > > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > > > > > copied
> > > > > > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > > > > > >> 'content' dir your subsequent status is showing as being
> > > > > > > updated?
> > > > > > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > > > > > >>
> > > > > > > > > > > >> Robbie
> > > > > > > > > > > >>
> > > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > > >> >
> > > > > > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > > > > > >> >
> > > > > > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > > >> >
> > > > > > > > > > > >> >
> > > > > > > > > > > >> > The only concern I have so far is that any time I build, I
> > > > > > > get a
> > > > > > > > > > > >> > change into a schema:
> > > > > > > > > > > >> >
> > > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > > > > > working
> > > > > > > > > > directory)
> > > > > > > > > > > >> >
> > > > > > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > > > > > >> >
> > > > > > > > > > > >> >
> > > > > > > > > > > >> >
> > > > > > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > > > > > committing..
> > > > > > > > > > > >> >
> > > > > > > > > > > >> > Any ideas?
> > > > > > > > > > > >> >
> > > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > > > > > jbertram@apache.org>
> > > > > > > > > > wrote:
> > > > > > > > > > > >> > >
> > > > > > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > > > > > >> > >
> > > > > > > > > > > >> > >
> > > > > > > > > > > >> > > Justin
> > > > > > > > > > > >> > >
> > > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > >> > > wrote:
> > > > > > > > > > > >> > >
> > > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > >> > > > >
> > > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > > >> > > > wrote:
> > > > > > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > > > > > >> > > > >
> > > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > > > > > infra.
> > > > > > > > > > > >> > > > >
> > > > > > > > > > > >> > > > > Can we keep the history from master
> > > > > > > > > > > >> > > >
> > > > > > > > > > > >> > > >
> > > > > > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > > > > > same
> > > > > > > > > > branch I
> > > > > > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > > > > > I
> > > > > > > > > > just tried
> > > > > > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > > > > > the
> > > > > > > > > > asf-site
> > > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > > >> > > >
> > > > > > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > > > > > the
> > > > > > > > > > asf-site
> > > > > > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > > > > > simplify
> > > > > > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > > > > > the
> > > > > > > > > > .gitignore
> > > > > > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > > > > > push.
> > > > > > > > > > > >> > > >
> > > > > > > > > > > >> > > > Assuming of course others agree that it is what should
> > > > > > > happen?
> > > > > > > > > > > >> > > >
> > > > > > > > > > > >> > > > Robbie
> > > > > > > > > > > >> > > >
> > > > > > > > > > > >> >
> > > > > > > > > > > >> >
> > > > > > > > > > > >> >
> > > > > > > > > > > >> > --
> > > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > > >
> > > > > > > > > > > > --
> > > > > > > > > > > > Clebert Suconic
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > --
> > > > > > > > > > > Clebert Suconic
> > > > > > > > > >
> > > > > > > > > --
> > > > > > > > > Clebert Suconic
> > > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > > >
> > > >
> > > >
> > > > --
> > > > Clebert Suconic
>
>
>
> --
> Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
everything is on master now!!!
I just did one dumb change to make sure the update worked, and it
did... everything is on master now.
On Mon, Oct 7, 2019 at 11:50 AM Robbie Gemmell <ro...@gmail.com> wrote:
>
> Or, alternatively, instead of updating the contents of asf-site and
> removing master, per the JIRA discussion we could change the site to
> be published from master instead of asf-site ourselves by adding a
> .asf.yaml file:
> https://issues.apache.org/jira/browse/INFRA-19235
>
> On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <ro...@gmail.com> wrote:
> >
> > We can update the contents of the asf-site branch to suit our needs,
> > the only requirement from infra is that the published content is in
> > the content dir. The only thing we needed them to do would be change
> > the default branch.
> >
> > Daniel will be talking about the new abilities offered by the more
> > recently added asf.yaml stuff which can do various other things and
> > override the existing website publishing stuff:
> > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
> >
> > We can certainly look to add more of the stuff like staging etc if
> > folks wanted, but I'd say its seperate from this change, and I dont
> > personally see a real need for it right now.
> >
> > Robbie
> >
> > On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <cl...@gmail.com> wrote:
> > >
> > > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > >
> > > > I'm not sure I see a need for creating another branch or asking infra
> > > > to assist in the update itself. We are effectively just adding the
> > > > source and history to the asf-site branch, which is where the site
> > > > bits have to go, byt overwriting it, which we can do. The only thing
> > > > we should really need infra to do is change the default branch setting
> > > > to asf-site after the update is done, and then master can be removed.
> > >
> > > We could certainly do that. I just wanted to make sure Infra would
> > > have no issues with the change.
> > >
> > > Daniel is talking about a yaml file I never heard about, even talking
> > > about staging website (which could be useful as part of our release
> > > processes).
> > >
> > > I'm getting confused through the JIRA. and I need help :)
> > >
> > > >
> > > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> > > > >
> > > > > I will do the right thing. I will create a branch called future-master.
> > > > > And ask infra to update everything.
> > > > >
> > > > > I will send a separate thread with a clear title.
> > > > >
> > > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > > > > wrote:
> > > > >
> > > > > > A necessary change would be updating the readme to describe the
> > > > > > updated build + publish process. I've raised a PR against your test
> > > > > > branch with suggested changes:
> > > > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > > >
> > > > > > Robbie
> > > > > >
> > > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > > > > wrote:
> > > > > > >
> > > > > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > > > > otherwise, so its clear when the change might happen and that lazy
> > > > > > > consensus can be taken as only a few folks have commented on this
> > > > > > > thread.
> > > > > > >
> > > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > > > > wrote:
> > > > > > > >
> > > > > > > > Should we move it then ?
> > > > > > > >
> > > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > > robbie.gemmell@gmail.com>
> > > > > > > > wrote:
> > > > > > > >
> > > > > > > > > What you did is just what the exiting build script did, so that
> > > > > > should
> > > > > > > > > be fine if it was previously. I tried with and without the
> > > > > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > > > > you now dont, but at least its working now.
> > > > > > > > >
> > > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > > > > clebert.suconic@gmail.com>
> > > > > > > > > wrote:
> > > > > > > > > >
> > > > > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > > > > late hours.. I messed something up.
> > > > > > > > > >
> > > > > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > > > > caused it.
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > Playing with a single branch would make it a lot easier. It
> > > > > > bothers me
> > > > > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > > > > files
> > > > > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > > > > though ;) )
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > > > > replace asf-site by my test branch.
> > > > > > > > > >
> > > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > > >
> > > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > > >
> > > > > > > > > > > Check out asf-siite
> > > > > > > > > > > Move it.
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > Checkout the test branch
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > Moved it back.
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > > >>
> > > > > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > > > > ever
> > > > > > > > > > >> seen the 'typechange' file status before.
> > > > > > > > > > >>
> > > > > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > > > > symlink, and
> > > > > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > > > > when
> > > > > > > > > > >> such link is replaced with an actual file. If I do that
> > > > > > deliberately,
> > > > > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > > > > happen
> > > > > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > > > > copied
> > > > > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > > > > >> 'content' dir your subsequent status is showing as being
> > > > > > updated?
> > > > > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > > > > >>
> > > > > > > > > > >> Robbie
> > > > > > > > > > >>
> > > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > > >> >
> > > > > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > > > > >> >
> > > > > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > > >> >
> > > > > > > > > > >> >
> > > > > > > > > > >> > The only concern I have so far is that any time I build, I
> > > > > > get a
> > > > > > > > > > >> > change into a schema:
> > > > > > > > > > >> >
> > > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > > > > working
> > > > > > > > > directory)
> > > > > > > > > > >> >
> > > > > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > > > > >> >
> > > > > > > > > > >> >
> > > > > > > > > > >> >
> > > > > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > > > > committing..
> > > > > > > > > > >> >
> > > > > > > > > > >> > Any ideas?
> > > > > > > > > > >> >
> > > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > > > > jbertram@apache.org>
> > > > > > > > > wrote:
> > > > > > > > > > >> > >
> > > > > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > > > > >> > >
> > > > > > > > > > >> > >
> > > > > > > > > > >> > > Justin
> > > > > > > > > > >> > >
> > > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > >> > > wrote:
> > > > > > > > > > >> > >
> > > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > > >> > > > wrote:
> > > > > > > > > > >> > > > >
> > > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > > >> > > > wrote:
> > > > > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > > > > >> > > > >
> > > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > > > > infra.
> > > > > > > > > > >> > > > >
> > > > > > > > > > >> > > > > Can we keep the history from master
> > > > > > > > > > >> > > >
> > > > > > > > > > >> > > >
> > > > > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > > > > same
> > > > > > > > > branch I
> > > > > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > > > > I
> > > > > > > > > just tried
> > > > > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > > > > the
> > > > > > > > > asf-site
> > > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > > >> > > >
> > > > > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > > > > the
> > > > > > > > > asf-site
> > > > > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > > > > simplify
> > > > > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > > > > the
> > > > > > > > > .gitignore
> > > > > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > > > > push.
> > > > > > > > > > >> > > >
> > > > > > > > > > >> > > > Assuming of course others agree that it is what should
> > > > > > happen?
> > > > > > > > > > >> > > >
> > > > > > > > > > >> > > > Robbie
> > > > > > > > > > >> > > >
> > > > > > > > > > >> >
> > > > > > > > > > >> >
> > > > > > > > > > >> >
> > > > > > > > > > >> > --
> > > > > > > > > > >> > Clebert Suconic
> > > > > > > > > > >
> > > > > > > > > > > --
> > > > > > > > > > > Clebert Suconic
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > --
> > > > > > > > > > Clebert Suconic
> > > > > > > > >
> > > > > > > > --
> > > > > > > > Clebert Suconic
> > > > > >
> > > > > --
> > > > > Clebert Suconic
> > >
> > >
> > >
> > > --
> > > Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
Or, alternatively, instead of updating the contents of asf-site and
removing master, per the JIRA discussion we could change the site to
be published from master instead of asf-site ourselves by adding a
.asf.yaml file:
https://issues.apache.org/jira/browse/INFRA-19235
On Mon, 7 Oct 2019 at 16:09, Robbie Gemmell <ro...@gmail.com> wrote:
>
> We can update the contents of the asf-site branch to suit our needs,
> the only requirement from infra is that the published content is in
> the content dir. The only thing we needed them to do would be change
> the default branch.
>
> Daniel will be talking about the new abilities offered by the more
> recently added asf.yaml stuff which can do various other things and
> override the existing website publishing stuff:
> https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
>
> We can certainly look to add more of the stuff like staging etc if
> folks wanted, but I'd say its seperate from this change, and I dont
> personally see a real need for it right now.
>
> Robbie
>
> On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <cl...@gmail.com> wrote:
> >
> > On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > >
> > > I'm not sure I see a need for creating another branch or asking infra
> > > to assist in the update itself. We are effectively just adding the
> > > source and history to the asf-site branch, which is where the site
> > > bits have to go, byt overwriting it, which we can do. The only thing
> > > we should really need infra to do is change the default branch setting
> > > to asf-site after the update is done, and then master can be removed.
> >
> > We could certainly do that. I just wanted to make sure Infra would
> > have no issues with the change.
> >
> > Daniel is talking about a yaml file I never heard about, even talking
> > about staging website (which could be useful as part of our release
> > processes).
> >
> > I'm getting confused through the JIRA. and I need help :)
> >
> > >
> > > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> > > >
> > > > I will do the right thing. I will create a branch called future-master.
> > > > And ask infra to update everything.
> > > >
> > > > I will send a separate thread with a clear title.
> > > >
> > > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > > > wrote:
> > > >
> > > > > A necessary change would be updating the readme to describe the
> > > > > updated build + publish process. I've raised a PR against your test
> > > > > branch with suggested changes:
> > > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > > >
> > > > > Robbie
> > > > >
> > > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > > > wrote:
> > > > > >
> > > > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > > > otherwise, so its clear when the change might happen and that lazy
> > > > > > consensus can be taken as only a few folks have commented on this
> > > > > > thread.
> > > > > >
> > > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > > > wrote:
> > > > > > >
> > > > > > > Should we move it then ?
> > > > > > >
> > > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com>
> > > > > > > wrote:
> > > > > > >
> > > > > > > > What you did is just what the exiting build script did, so that
> > > > > should
> > > > > > > > be fine if it was previously. I tried with and without the
> > > > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > > > you now dont, but at least its working now.
> > > > > > > >
> > > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > > > clebert.suconic@gmail.com>
> > > > > > > > wrote:
> > > > > > > > >
> > > > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > > > late hours.. I messed something up.
> > > > > > > > >
> > > > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > > > caused it.
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > Playing with a single branch would make it a lot easier. It
> > > > > bothers me
> > > > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > > > files
> > > > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > > > though ;) )
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > > > replace asf-site by my test branch.
> > > > > > > > >
> > > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > > >
> > > > > > > > > > I copied the folder from the branch.
> > > > > > > > > >
> > > > > > > > > > Check out asf-siite
> > > > > > > > > > Move it.
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > Checkout the test branch
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > Moved it back.
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > > >>
> > > > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > > > ever
> > > > > > > > > >> seen the 'typechange' file status before.
> > > > > > > > > >>
> > > > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > > > symlink, and
> > > > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > > > when
> > > > > > > > > >> such link is replaced with an actual file. If I do that
> > > > > deliberately,
> > > > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > > > happen
> > > > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > > > copied
> > > > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > > > >> 'content' dir your subsequent status is showing as being
> > > > > updated?
> > > > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > > > >>
> > > > > > > > > >> Robbie
> > > > > > > > > >>
> > > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > > >> >
> > > > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > > > >> >
> > > > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > > >> >
> > > > > > > > > >> >
> > > > > > > > > >> > The only concern I have so far is that any time I build, I
> > > > > get a
> > > > > > > > > >> > change into a schema:
> > > > > > > > > >> >
> > > > > > > > > >> > Changes not staged for commit:
> > > > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > > > working
> > > > > > > > directory)
> > > > > > > > > >> >
> > > > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > > > >> >
> > > > > > > > > >> >
> > > > > > > > > >> >
> > > > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > > > committing..
> > > > > > > > > >> >
> > > > > > > > > >> > Any ideas?
> > > > > > > > > >> >
> > > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > > > jbertram@apache.org>
> > > > > > > > wrote:
> > > > > > > > > >> > >
> > > > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > > > >> > >
> > > > > > > > > >> > >
> > > > > > > > > >> > > Justin
> > > > > > > > > >> > >
> > > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > >> > > wrote:
> > > > > > > > > >> > >
> > > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > > > clebert.suconic@gmail.com>
> > > > > > > > > >> > > > wrote:
> > > > > > > > > >> > > > >
> > > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > > >> > > > wrote:
> > > > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > > > >> > > > >
> > > > > > > > > >> > > > > Tl;DR:
> > > > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > > > infra.
> > > > > > > > > >> > > > >
> > > > > > > > > >> > > > > Can we keep the history from master
> > > > > > > > > >> > > >
> > > > > > > > > >> > > >
> > > > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > > > same
> > > > > > > > branch I
> > > > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > > > I
> > > > > > > > just tried
> > > > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > > > the
> > > > > > > > asf-site
> > > > > > > > > >> > > > branch in the website repo.
> > > > > > > > > >> > > >
> > > > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > > > the
> > > > > > > > asf-site
> > > > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > > > simplify
> > > > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > > > the
> > > > > > > > .gitignore
> > > > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > > > push.
> > > > > > > > > >> > > >
> > > > > > > > > >> > > > Assuming of course others agree that it is what should
> > > > > happen?
> > > > > > > > > >> > > >
> > > > > > > > > >> > > > Robbie
> > > > > > > > > >> > > >
> > > > > > > > > >> >
> > > > > > > > > >> >
> > > > > > > > > >> >
> > > > > > > > > >> > --
> > > > > > > > > >> > Clebert Suconic
> > > > > > > > > >
> > > > > > > > > > --
> > > > > > > > > > Clebert Suconic
> > > > > > > > >
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > --
> > > > > > > > > Clebert Suconic
> > > > > > > >
> > > > > > > --
> > > > > > > Clebert Suconic
> > > > >
> > > > --
> > > > Clebert Suconic
> >
> >
> >
> > --
> > Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
We can update the contents of the asf-site branch to suit our needs,
the only requirement from infra is that the published content is in
the content dir. The only thing we needed them to do would be change
the default branch.
Daniel will be talking about the new abilities offered by the more
recently added asf.yaml stuff which can do various other things and
override the existing website publishing stuff:
https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
We can certainly look to add more of the stuff like staging etc if
folks wanted, but I'd say its seperate from this change, and I dont
personally see a real need for it right now.
Robbie
On Mon, 7 Oct 2019 at 15:31, Clebert Suconic <cl...@gmail.com> wrote:
>
> On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
> >
> > I'm not sure I see a need for creating another branch or asking infra
> > to assist in the update itself. We are effectively just adding the
> > source and history to the asf-site branch, which is where the site
> > bits have to go, byt overwriting it, which we can do. The only thing
> > we should really need infra to do is change the default branch setting
> > to asf-site after the update is done, and then master can be removed.
>
> We could certainly do that. I just wanted to make sure Infra would
> have no issues with the change.
>
> Daniel is talking about a yaml file I never heard about, even talking
> about staging website (which could be useful as part of our release
> processes).
>
> I'm getting confused through the JIRA. and I need help :)
>
> >
> > On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> > >
> > > I will do the right thing. I will create a branch called future-master.
> > > And ask infra to update everything.
> > >
> > > I will send a separate thread with a clear title.
> > >
> > > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > > wrote:
> > >
> > > > A necessary change would be updating the readme to describe the
> > > > updated build + publish process. I've raised a PR against your test
> > > > branch with suggested changes:
> > > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > > >
> > > > Robbie
> > > >
> > > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > > wrote:
> > > > >
> > > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > > otherwise, so its clear when the change might happen and that lazy
> > > > > consensus can be taken as only a few folks have commented on this
> > > > > thread.
> > > > >
> > > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > > wrote:
> > > > > >
> > > > > > Should we move it then ?
> > > > > >
> > > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > > robbie.gemmell@gmail.com>
> > > > > > wrote:
> > > > > >
> > > > > > > What you did is just what the exiting build script did, so that
> > > > should
> > > > > > > be fine if it was previously. I tried with and without the
> > > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > > you now dont, but at least its working now.
> > > > > > >
> > > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > > clebert.suconic@gmail.com>
> > > > > > > wrote:
> > > > > > > >
> > > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > > late hours.. I messed something up.
> > > > > > > >
> > > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > > caused it.
> > > > > > > >
> > > > > > > >
> > > > > > > > Playing with a single branch would make it a lot easier. It
> > > > bothers me
> > > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > > files
> > > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > > though ;) )
> > > > > > > >
> > > > > > > >
> > > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > > replace asf-site by my test branch.
> > > > > > > >
> > > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > > <cl...@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > I copied the folder from the branch.
> > > > > > > > >
> > > > > > > > > Check out asf-siite
> > > > > > > > > Move it.
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > Checkout the test branch
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > Moved it back.
> > > > > > > > >
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > > >>
> > > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > > ever
> > > > > > > > >> seen the 'typechange' file status before.
> > > > > > > > >>
> > > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > > symlink, and
> > > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > > when
> > > > > > > > >> such link is replaced with an actual file. If I do that
> > > > deliberately,
> > > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > > happen
> > > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > > copied
> > > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > > >> 'content' dir your subsequent status is showing as being
> > > > updated?
> > > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > > >>
> > > > > > > > >> Robbie
> > > > > > > > >>
> > > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > > >> >
> > > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > > >> >
> > > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > > >> >
> > > > > > > > >> >
> > > > > > > > >> > The only concern I have so far is that any time I build, I
> > > > get a
> > > > > > > > >> > change into a schema:
> > > > > > > > >> >
> > > > > > > > >> > Changes not staged for commit:
> > > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > > working
> > > > > > > directory)
> > > > > > > > >> >
> > > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > > >> >
> > > > > > > > >> >
> > > > > > > > >> >
> > > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > > committing..
> > > > > > > > >> >
> > > > > > > > >> > Any ideas?
> > > > > > > > >> >
> > > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > > jbertram@apache.org>
> > > > > > > wrote:
> > > > > > > > >> > >
> > > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > > >> > >
> > > > > > > > >> > >
> > > > > > > > >> > > Justin
> > > > > > > > >> > >
> > > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > >> > > wrote:
> > > > > > > > >> > >
> > > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > > clebert.suconic@gmail.com>
> > > > > > > > >> > > > wrote:
> > > > > > > > >> > > > >
> > > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > > robbie.gemmell@gmail.com>
> > > > > > > > >> > > > wrote:
> > > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > > >> > > > >
> > > > > > > > >> > > > > Tl;DR:
> > > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > > infra.
> > > > > > > > >> > > > >
> > > > > > > > >> > > > > Can we keep the history from master
> > > > > > > > >> > > >
> > > > > > > > >> > > >
> > > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > > same
> > > > > > > branch I
> > > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > > I
> > > > > > > just tried
> > > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > > the
> > > > > > > asf-site
> > > > > > > > >> > > > branch in the website repo.
> > > > > > > > >> > > >
> > > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > > the
> > > > > > > asf-site
> > > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > > simplify
> > > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > > the
> > > > > > > .gitignore
> > > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > > push.
> > > > > > > > >> > > >
> > > > > > > > >> > > > Assuming of course others agree that it is what should
> > > > happen?
> > > > > > > > >> > > >
> > > > > > > > >> > > > Robbie
> > > > > > > > >> > > >
> > > > > > > > >> >
> > > > > > > > >> >
> > > > > > > > >> >
> > > > > > > > >> > --
> > > > > > > > >> > Clebert Suconic
> > > > > > > > >
> > > > > > > > > --
> > > > > > > > > Clebert Suconic
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > --
> > > > > > > > Clebert Suconic
> > > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > > >
> > > --
> > > Clebert Suconic
>
>
>
> --
> Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
On Mon, Oct 7, 2019 at 9:37 AM Robbie Gemmell <ro...@gmail.com> wrote:
>
> I'm not sure I see a need for creating another branch or asking infra
> to assist in the update itself. We are effectively just adding the
> source and history to the asf-site branch, which is where the site
> bits have to go, byt overwriting it, which we can do. The only thing
> we should really need infra to do is change the default branch setting
> to asf-site after the update is done, and then master can be removed.
We could certainly do that. I just wanted to make sure Infra would
have no issues with the change.
Daniel is talking about a yaml file I never heard about, even talking
about staging website (which could be useful as part of our release
processes).
I'm getting confused through the JIRA. and I need help :)
>
> On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
> >
> > I will do the right thing. I will create a branch called future-master.
> > And ask infra to update everything.
> >
> > I will send a separate thread with a clear title.
> >
> > On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> > wrote:
> >
> > > A necessary change would be updating the readme to describe the
> > > updated build + publish process. I've raised a PR against your test
> > > branch with suggested changes:
> > > https://github.com/clebertsuconic/activemq-website/pull/1/files
> > >
> > > Robbie
> > >
> > > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > > wrote:
> > > >
> > > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > > to me. I'd start a separate thread though giving folks a heads up that
> > > > e.g you will do it tomorrow/some-other-point unless discussed
> > > > otherwise, so its clear when the change might happen and that lazy
> > > > consensus can be taken as only a few folks have commented on this
> > > > thread.
> > > >
> > > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > > wrote:
> > > > >
> > > > > Should we move it then ?
> > > > >
> > > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > > robbie.gemmell@gmail.com>
> > > > > wrote:
> > > > >
> > > > > > What you did is just what the exiting build script did, so that
> > > should
> > > > > > be fine if it was previously. I tried with and without the
> > > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > > different time wise either). Strange that you saw this, and strange
> > > > > > you now dont, but at least its working now.
> > > > > >
> > > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > > clebert.suconic@gmail.com>
> > > > > > wrote:
> > > > > > >
> > > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > > late hours.. I messed something up.
> > > > > > >
> > > > > > > I was playing with --incremental on jekyll perhaps that's what
> > > caused it.
> > > > > > >
> > > > > > >
> > > > > > > Playing with a single branch would make it a lot easier. It
> > > bothers me
> > > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > > files
> > > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > > though ;) )
> > > > > > >
> > > > > > >
> > > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > > replace asf-site by my test branch.
> > > > > > >
> > > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > > <cl...@gmail.com> wrote:
> > > > > > > >
> > > > > > > > I copied the folder from the branch.
> > > > > > > >
> > > > > > > > Check out asf-siite
> > > > > > > > Move it.
> > > > > > > >
> > > > > > > >
> > > > > > > > Checkout the test branch
> > > > > > > >
> > > > > > > >
> > > > > > > > Moved it back.
> > > > > > > >
> > > > > > > >
> > > > > > > >
> > > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > > >>
> > > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > > ever
> > > > > > > >> seen the 'typechange' file status before.
> > > > > > > >>
> > > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > > symlink, and
> > > > > > > >> some googling suggests the 'typechange' status mainly happens
> > > when
> > > > > > > >> such link is replaced with an actual file. If I do that
> > > deliberately,
> > > > > > > >> I then see the same status you do. Some posts suggested it can
> > > happen
> > > > > > > >> with certain copy commands, that have dereferenced the link and
> > > copied
> > > > > > > >> the referenced files content. How did you initially populate the
> > > > > > > >> 'content' dir your subsequent status is showing as being
> > > updated?
> > > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > > >>
> > > > > > > >> Robbie
> > > > > > > >>
> > > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > > clebert.suconic@gmail.com> wrote:
> > > > > > > >> >
> > > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > > >> >
> > > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > > >> >
> > > > > > > >> >
> > > > > > > >> > The only concern I have so far is that any time I build, I
> > > get a
> > > > > > > >> > change into a schema:
> > > > > > > >> >
> > > > > > > >> > Changes not staged for commit:
> > > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > > working
> > > > > > directory)
> > > > > > > >> >
> > > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > > >> >
> > > > > > > >> >
> > > > > > > >> >
> > > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > > committing..
> > > > > > > >> >
> > > > > > > >> > Any ideas?
> > > > > > > >> >
> > > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > > jbertram@apache.org>
> > > > > > wrote:
> > > > > > > >> > >
> > > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > > >> > >
> > > > > > > >> > >
> > > > > > > >> > > Justin
> > > > > > > >> > >
> > > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > > robbie.gemmell@gmail.com>
> > > > > > > >> > > wrote:
> > > > > > > >> > >
> > > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > > clebert.suconic@gmail.com>
> > > > > > > >> > > > wrote:
> > > > > > > >> > > > >
> > > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > > robbie.gemmell@gmail.com>
> > > > > > > >> > > > wrote:
> > > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > > >> > > > >
> > > > > > > >> > > > > Tl;DR:
> > > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > > infra.
> > > > > > > >> > > > >
> > > > > > > >> > > > > Can we keep the history from master
> > > > > > > >> > > >
> > > > > > > >> > > >
> > > > > > > >> > > > We wouldnt need to change much to get everything on the
> > > same
> > > > > > branch I
> > > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > > I
> > > > > > just tried
> > > > > > > >> > > > on your last commit as a test and was able to force-push
> > > the
> > > > > > asf-site
> > > > > > > >> > > > branch in the website repo.
> > > > > > > >> > > >
> > > > > > > >> > > > So basically it seems it needs something like: repopulate
> > > the
> > > > > > asf-site
> > > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > > simplify
> > > > > > > >> > > > the build script to only build and nothing else, fix up
> > > the
> > > > > > .gitignore
> > > > > > > >> > > > file appropriately, build things, commit, and [force]
> > > push.
> > > > > > > >> > > >
> > > > > > > >> > > > Assuming of course others agree that it is what should
> > > happen?
> > > > > > > >> > > >
> > > > > > > >> > > > Robbie
> > > > > > > >> > > >
> > > > > > > >> >
> > > > > > > >> >
> > > > > > > >> >
> > > > > > > >> > --
> > > > > > > >> > Clebert Suconic
> > > > > > > >
> > > > > > > > --
> > > > > > > > Clebert Suconic
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Clebert Suconic
> > > > > >
> > > > > --
> > > > > Clebert Suconic
> > >
> > --
> > Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
I'm not sure I see a need for creating another branch or asking infra
to assist in the update itself. We are effectively just adding the
source and history to the asf-site branch, which is where the site
bits have to go, byt overwriting it, which we can do. The only thing
we should really need infra to do is change the default branch setting
to asf-site after the update is done, and then master can be removed.
On Mon, 7 Oct 2019 at 13:51, Clebert Suconic <cl...@gmail.com> wrote:
>
> I will do the right thing. I will create a branch called future-master.
> And ask infra to update everything.
>
> I will send a separate thread with a clear title.
>
> On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
> wrote:
>
> > A necessary change would be updating the readme to describe the
> > updated build + publish process. I've raised a PR against your test
> > branch with suggested changes:
> > https://github.com/clebertsuconic/activemq-website/pull/1/files
> >
> > Robbie
> >
> > On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> > wrote:
> > >
> > > Do you mean move things over to the asf-site branch? Seems reasonable
> > > to me. I'd start a separate thread though giving folks a heads up that
> > > e.g you will do it tomorrow/some-other-point unless discussed
> > > otherwise, so its clear when the change might happen and that lazy
> > > consensus can be taken as only a few folks have commented on this
> > > thread.
> > >
> > > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> > wrote:
> > > >
> > > > Should we move it then ?
> > > >
> > > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> > robbie.gemmell@gmail.com>
> > > > wrote:
> > > >
> > > > > What you did is just what the exiting build script did, so that
> > should
> > > > > be fine if it was previously. I tried with and without the
> > > > > --incremental and it didnt make a difference here (wasn't much
> > > > > different time wise either). Strange that you saw this, and strange
> > > > > you now dont, but at least its working now.
> > > > >
> > > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> > clebert.suconic@gmail.com>
> > > > > wrote:
> > > > > >
> > > > > > I did not see the error again. I guess it was an effect of working
> > > > > > late hours.. I messed something up.
> > > > > >
> > > > > > I was playing with --incremental on jekyll perhaps that's what
> > caused it.
> > > > > >
> > > > > >
> > > > > > Playing with a single branch would make it a lot easier. It
> > bothers me
> > > > > > to keep moving between branches as my IDE gets crazy on indexing
> > files
> > > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > > though ;) )
> > > > > >
> > > > > >
> > > > > > If more people could double check this is okay.. perhaps we can
> > > > > > replace asf-site by my test branch.
> > > > > >
> > > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > > <cl...@gmail.com> wrote:
> > > > > > >
> > > > > > > I copied the folder from the branch.
> > > > > > >
> > > > > > > Check out asf-siite
> > > > > > > Move it.
> > > > > > >
> > > > > > >
> > > > > > > Checkout the test branch
> > > > > > >
> > > > > > >
> > > > > > > Moved it back.
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com> wrote:
> > > > > > >>
> > > > > > >> I dont see that happen when I run the build, and hadnt actually
> > ever
> > > > > > >> seen the 'typechange' file status before.
> > > > > > >>
> > > > > > >> The content/schema/core/activemq-core.xsd is actually a
> > symlink, and
> > > > > > >> some googling suggests the 'typechange' status mainly happens
> > when
> > > > > > >> such link is replaced with an actual file. If I do that
> > deliberately,
> > > > > > >> I then see the same status you do. Some posts suggested it can
> > happen
> > > > > > >> with certain copy commands, that have dereferenced the link and
> > copied
> > > > > > >> the referenced files content. How did you initially populate the
> > > > > > >> 'content' dir your subsequent status is showing as being
> > updated?
> > > > > > >> Running the build afresh, or copying prior build output?
> > > > > > >>
> > > > > > >> Robbie
> > > > > > >>
> > > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > > clebert.suconic@gmail.com> wrote:
> > > > > > >> >
> > > > > > >> > I have a branch where I'm using a single branch:
> > > > > > >> >
> > > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > > >> >
> > > > > > >> >
> > > > > > >> > The only concern I have so far is that any time I build, I
> > get a
> > > > > > >> > change into a schema:
> > > > > > >> >
> > > > > > >> > Changes not staged for commit:
> > > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > > >> > (use "git checkout -- <file>..." to discard changes in
> > working
> > > > > directory)
> > > > > > >> >
> > > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > > >> >
> > > > > > >> >
> > > > > > >> >
> > > > > > >> > Although I would consider that anyone would check stuff before
> > > > > committing..
> > > > > > >> >
> > > > > > >> > Any ideas?
> > > > > > >> >
> > > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> > jbertram@apache.org>
> > > > > wrote:
> > > > > > >> > >
> > > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > > >> > >
> > > > > > >> > >
> > > > > > >> > > Justin
> > > > > > >> > >
> > > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com>
> > > > > > >> > > wrote:
> > > > > > >> > >
> > > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > > clebert.suconic@gmail.com>
> > > > > > >> > > > wrote:
> > > > > > >> > > > >
> > > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > > robbie.gemmell@gmail.com>
> > > > > > >> > > > wrote:
> > > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > > >> > > > >
> > > > > > >> > > > > Tl;DR:
> > > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> > infra.
> > > > > > >> > > > >
> > > > > > >> > > > > Can we keep the history from master
> > > > > > >> > > >
> > > > > > >> > > >
> > > > > > >> > > > We wouldnt need to change much to get everything on the
> > same
> > > > > branch I
> > > > > > >> > > > dont think, and it seems like we can do so without infra:
> > I
> > > > > just tried
> > > > > > >> > > > on your last commit as a test and was able to force-push
> > the
> > > > > asf-site
> > > > > > >> > > > branch in the website repo.
> > > > > > >> > > >
> > > > > > >> > > > So basically it seems it needs something like: repopulate
> > the
> > > > > asf-site
> > > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > > simplify
> > > > > > >> > > > the build script to only build and nothing else, fix up
> > the
> > > > > .gitignore
> > > > > > >> > > > file appropriately, build things, commit, and [force]
> > push.
> > > > > > >> > > >
> > > > > > >> > > > Assuming of course others agree that it is what should
> > happen?
> > > > > > >> > > >
> > > > > > >> > > > Robbie
> > > > > > >> > > >
> > > > > > >> >
> > > > > > >> >
> > > > > > >> >
> > > > > > >> > --
> > > > > > >> > Clebert Suconic
> > > > > > >
> > > > > > > --
> > > > > > > Clebert Suconic
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > > > >
> > > > --
> > > > Clebert Suconic
> >
> --
> Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
I will do the right thing. I will create a branch called future-master.
And ask infra to update everything.
I will send a separate thread with a clear title.
On Mon, Oct 7, 2019 at 6:42 AM Robbie Gemmell <ro...@gmail.com>
wrote:
> A necessary change would be updating the readme to describe the
> updated build + publish process. I've raised a PR against your test
> branch with suggested changes:
> https://github.com/clebertsuconic/activemq-website/pull/1/files
>
> Robbie
>
> On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com>
> wrote:
> >
> > Do you mean move things over to the asf-site branch? Seems reasonable
> > to me. I'd start a separate thread though giving folks a heads up that
> > e.g you will do it tomorrow/some-other-point unless discussed
> > otherwise, so its clear when the change might happen and that lazy
> > consensus can be taken as only a few folks have commented on this
> > thread.
> >
> > On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com>
> wrote:
> > >
> > > Should we move it then ?
> > >
> > > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <
> robbie.gemmell@gmail.com>
> > > wrote:
> > >
> > > > What you did is just what the exiting build script did, so that
> should
> > > > be fine if it was previously. I tried with and without the
> > > > --incremental and it didnt make a difference here (wasn't much
> > > > different time wise either). Strange that you saw this, and strange
> > > > you now dont, but at least its working now.
> > > >
> > > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <
> clebert.suconic@gmail.com>
> > > > wrote:
> > > > >
> > > > > I did not see the error again. I guess it was an effect of working
> > > > > late hours.. I messed something up.
> > > > >
> > > > > I was playing with --incremental on jekyll perhaps that's what
> caused it.
> > > > >
> > > > >
> > > > > Playing with a single branch would make it a lot easier. It
> bothers me
> > > > > to keep moving between branches as my IDE gets crazy on indexing
> files
> > > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > > though ;) )
> > > > >
> > > > >
> > > > > If more people could double check this is okay.. perhaps we can
> > > > > replace asf-site by my test branch.
> > > > >
> > > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > > <cl...@gmail.com> wrote:
> > > > > >
> > > > > > I copied the folder from the branch.
> > > > > >
> > > > > > Check out asf-siite
> > > > > > Move it.
> > > > > >
> > > > > >
> > > > > > Checkout the test branch
> > > > > >
> > > > > >
> > > > > > Moved it back.
> > > > > >
> > > > > >
> > > > > >
> > > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > > robbie.gemmell@gmail.com> wrote:
> > > > > >>
> > > > > >> I dont see that happen when I run the build, and hadnt actually
> ever
> > > > > >> seen the 'typechange' file status before.
> > > > > >>
> > > > > >> The content/schema/core/activemq-core.xsd is actually a
> symlink, and
> > > > > >> some googling suggests the 'typechange' status mainly happens
> when
> > > > > >> such link is replaced with an actual file. If I do that
> deliberately,
> > > > > >> I then see the same status you do. Some posts suggested it can
> happen
> > > > > >> with certain copy commands, that have dereferenced the link and
> copied
> > > > > >> the referenced files content. How did you initially populate the
> > > > > >> 'content' dir your subsequent status is showing as being
> updated?
> > > > > >> Running the build afresh, or copying prior build output?
> > > > > >>
> > > > > >> Robbie
> > > > > >>
> > > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > > clebert.suconic@gmail.com> wrote:
> > > > > >> >
> > > > > >> > I have a branch where I'm using a single branch:
> > > > > >> >
> > > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > > >> >
> > > > > >> >
> > > > > >> > The only concern I have so far is that any time I build, I
> get a
> > > > > >> > change into a schema:
> > > > > >> >
> > > > > >> > Changes not staged for commit:
> > > > > >> > (use "git add <file>..." to update what will be committed)
> > > > > >> > (use "git checkout -- <file>..." to discard changes in
> working
> > > > directory)
> > > > > >> >
> > > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > > >> >
> > > > > >> >
> > > > > >> >
> > > > > >> > Although I would consider that anyone would check stuff before
> > > > committing..
> > > > > >> >
> > > > > >> > Any ideas?
> > > > > >> >
> > > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <
> jbertram@apache.org>
> > > > wrote:
> > > > > >> > >
> > > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > > >> > >
> > > > > >> > >
> > > > > >> > > Justin
> > > > > >> > >
> > > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > > robbie.gemmell@gmail.com>
> > > > > >> > > wrote:
> > > > > >> > >
> > > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > > clebert.suconic@gmail.com>
> > > > > >> > > > wrote:
> > > > > >> > > > >
> > > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > > robbie.gemmell@gmail.com>
> > > > > >> > > > wrote:
> > > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > >> > > > > > projects do, I find it simpler overall.
> > > > > >> > > > >
> > > > > >> > > > > Tl;DR:
> > > > > >> > > > > I'm all +10000000 on this... what we need to change on
> infra.
> > > > > >> > > > >
> > > > > >> > > > > Can we keep the history from master
> > > > > >> > > >
> > > > > >> > > >
> > > > > >> > > > We wouldnt need to change much to get everything on the
> same
> > > > branch I
> > > > > >> > > > dont think, and it seems like we can do so without infra:
> I
> > > > just tried
> > > > > >> > > > on your last commit as a test and was able to force-push
> the
> > > > asf-site
> > > > > >> > > > branch in the website repo.
> > > > > >> > > >
> > > > > >> > > > So basically it seems it needs something like: repopulate
> the
> > > > asf-site
> > > > > >> > > > branch (or a test branch) with the master history locally,
> > > > simplify
> > > > > >> > > > the build script to only build and nothing else, fix up
> the
> > > > .gitignore
> > > > > >> > > > file appropriately, build things, commit, and [force]
> push.
> > > > > >> > > >
> > > > > >> > > > Assuming of course others agree that it is what should
> happen?
> > > > > >> > > >
> > > > > >> > > > Robbie
> > > > > >> > > >
> > > > > >> >
> > > > > >> >
> > > > > >> >
> > > > > >> > --
> > > > > >> > Clebert Suconic
> > > > > >
> > > > > > --
> > > > > > Clebert Suconic
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Clebert Suconic
> > > >
> > > --
> > > Clebert Suconic
>
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
A necessary change would be updating the readme to describe the
updated build + publish process. I've raised a PR against your test
branch with suggested changes:
https://github.com/clebertsuconic/activemq-website/pull/1/files
Robbie
On Mon, 7 Oct 2019 at 10:33, Robbie Gemmell <ro...@gmail.com> wrote:
>
> Do you mean move things over to the asf-site branch? Seems reasonable
> to me. I'd start a separate thread though giving folks a heads up that
> e.g you will do it tomorrow/some-other-point unless discussed
> otherwise, so its clear when the change might happen and that lazy
> consensus can be taken as only a few folks have commented on this
> thread.
>
> On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com> wrote:
> >
> > Should we move it then ?
> >
> > On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <ro...@gmail.com>
> > wrote:
> >
> > > What you did is just what the exiting build script did, so that should
> > > be fine if it was previously. I tried with and without the
> > > --incremental and it didnt make a difference here (wasn't much
> > > different time wise either). Strange that you saw this, and strange
> > > you now dont, but at least its working now.
> > >
> > > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <cl...@gmail.com>
> > > wrote:
> > > >
> > > > I did not see the error again. I guess it was an effect of working
> > > > late hours.. I messed something up.
> > > >
> > > > I was playing with --incremental on jekyll perhaps that's what caused it.
> > > >
> > > >
> > > > Playing with a single branch would make it a lot easier. It bothers me
> > > > to keep moving between branches as my IDE gets crazy on indexing files
> > > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > > though ;) )
> > > >
> > > >
> > > > If more people could double check this is okay.. perhaps we can
> > > > replace asf-site by my test branch.
> > > >
> > > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > > <cl...@gmail.com> wrote:
> > > > >
> > > > > I copied the folder from the branch.
> > > > >
> > > > > Check out asf-siite
> > > > > Move it.
> > > > >
> > > > >
> > > > > Checkout the test branch
> > > > >
> > > > >
> > > > > Moved it back.
> > > > >
> > > > >
> > > > >
> > > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > > robbie.gemmell@gmail.com> wrote:
> > > > >>
> > > > >> I dont see that happen when I run the build, and hadnt actually ever
> > > > >> seen the 'typechange' file status before.
> > > > >>
> > > > >> The content/schema/core/activemq-core.xsd is actually a symlink, and
> > > > >> some googling suggests the 'typechange' status mainly happens when
> > > > >> such link is replaced with an actual file. If I do that deliberately,
> > > > >> I then see the same status you do. Some posts suggested it can happen
> > > > >> with certain copy commands, that have dereferenced the link and copied
> > > > >> the referenced files content. How did you initially populate the
> > > > >> 'content' dir your subsequent status is showing as being updated?
> > > > >> Running the build afresh, or copying prior build output?
> > > > >>
> > > > >> Robbie
> > > > >>
> > > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > > clebert.suconic@gmail.com> wrote:
> > > > >> >
> > > > >> > I have a branch where I'm using a single branch:
> > > > >> >
> > > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > > >> >
> > > > >> >
> > > > >> > The only concern I have so far is that any time I build, I get a
> > > > >> > change into a schema:
> > > > >> >
> > > > >> > Changes not staged for commit:
> > > > >> > (use "git add <file>..." to update what will be committed)
> > > > >> > (use "git checkout -- <file>..." to discard changes in working
> > > directory)
> > > > >> >
> > > > >> > typechange: content/schema/core/activemq-core.xsd
> > > > >> >
> > > > >> >
> > > > >> >
> > > > >> > Although I would consider that anyone would check stuff before
> > > committing..
> > > > >> >
> > > > >> > Any ideas?
> > > > >> >
> > > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <jb...@apache.org>
> > > wrote:
> > > > >> > >
> > > > >> > > If it's simpler and documented that sounds like a win to me.
> > > > >> > >
> > > > >> > >
> > > > >> > > Justin
> > > > >> > >
> > > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > > robbie.gemmell@gmail.com>
> > > > >> > > wrote:
> > > > >> > >
> > > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > > clebert.suconic@gmail.com>
> > > > >> > > > wrote:
> > > > >> > > > >
> > > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > > robbie.gemmell@gmail.com>
> > > > >> > > > wrote:
> > > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > > >> > > > > > projects do, I find it simpler overall.
> > > > >> > > > >
> > > > >> > > > > Tl;DR:
> > > > >> > > > > I'm all +10000000 on this... what we need to change on infra.
> > > > >> > > > >
> > > > >> > > > > Can we keep the history from master
> > > > >> > > >
> > > > >> > > >
> > > > >> > > > We wouldnt need to change much to get everything on the same
> > > branch I
> > > > >> > > > dont think, and it seems like we can do so without infra: I
> > > just tried
> > > > >> > > > on your last commit as a test and was able to force-push the
> > > asf-site
> > > > >> > > > branch in the website repo.
> > > > >> > > >
> > > > >> > > > So basically it seems it needs something like: repopulate the
> > > asf-site
> > > > >> > > > branch (or a test branch) with the master history locally,
> > > simplify
> > > > >> > > > the build script to only build and nothing else, fix up the
> > > .gitignore
> > > > >> > > > file appropriately, build things, commit, and [force] push.
> > > > >> > > >
> > > > >> > > > Assuming of course others agree that it is what should happen?
> > > > >> > > >
> > > > >> > > > Robbie
> > > > >> > > >
> > > > >> >
> > > > >> >
> > > > >> >
> > > > >> > --
> > > > >> > Clebert Suconic
> > > > >
> > > > > --
> > > > > Clebert Suconic
> > > >
> > > >
> > > >
> > > > --
> > > > Clebert Suconic
> > >
> > --
> > Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
Do you mean move things over to the asf-site branch? Seems reasonable
to me. I'd start a separate thread though giving folks a heads up that
e.g you will do it tomorrow/some-other-point unless discussed
otherwise, so its clear when the change might happen and that lazy
consensus can be taken as only a few folks have commented on this
thread.
On Fri, 4 Oct 2019 at 18:02, Clebert Suconic <cl...@gmail.com> wrote:
>
> Should we move it then ?
>
> On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <ro...@gmail.com>
> wrote:
>
> > What you did is just what the exiting build script did, so that should
> > be fine if it was previously. I tried with and without the
> > --incremental and it didnt make a difference here (wasn't much
> > different time wise either). Strange that you saw this, and strange
> > you now dont, but at least its working now.
> >
> > On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <cl...@gmail.com>
> > wrote:
> > >
> > > I did not see the error again. I guess it was an effect of working
> > > late hours.. I messed something up.
> > >
> > > I was playing with --incremental on jekyll perhaps that's what caused it.
> > >
> > >
> > > Playing with a single branch would make it a lot easier. It bothers me
> > > to keep moving between branches as my IDE gets crazy on indexing files
> > > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > > though ;) )
> > >
> > >
> > > If more people could double check this is okay.. perhaps we can
> > > replace asf-site by my test branch.
> > >
> > > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > > <cl...@gmail.com> wrote:
> > > >
> > > > I copied the folder from the branch.
> > > >
> > > > Check out asf-siite
> > > > Move it.
> > > >
> > > >
> > > > Checkout the test branch
> > > >
> > > >
> > > > Moved it back.
> > > >
> > > >
> > > >
> > > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> > robbie.gemmell@gmail.com> wrote:
> > > >>
> > > >> I dont see that happen when I run the build, and hadnt actually ever
> > > >> seen the 'typechange' file status before.
> > > >>
> > > >> The content/schema/core/activemq-core.xsd is actually a symlink, and
> > > >> some googling suggests the 'typechange' status mainly happens when
> > > >> such link is replaced with an actual file. If I do that deliberately,
> > > >> I then see the same status you do. Some posts suggested it can happen
> > > >> with certain copy commands, that have dereferenced the link and copied
> > > >> the referenced files content. How did you initially populate the
> > > >> 'content' dir your subsequent status is showing as being updated?
> > > >> Running the build afresh, or copying prior build output?
> > > >>
> > > >> Robbie
> > > >>
> > > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> > clebert.suconic@gmail.com> wrote:
> > > >> >
> > > >> > I have a branch where I'm using a single branch:
> > > >> >
> > > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > > >> >
> > > >> >
> > > >> > The only concern I have so far is that any time I build, I get a
> > > >> > change into a schema:
> > > >> >
> > > >> > Changes not staged for commit:
> > > >> > (use "git add <file>..." to update what will be committed)
> > > >> > (use "git checkout -- <file>..." to discard changes in working
> > directory)
> > > >> >
> > > >> > typechange: content/schema/core/activemq-core.xsd
> > > >> >
> > > >> >
> > > >> >
> > > >> > Although I would consider that anyone would check stuff before
> > committing..
> > > >> >
> > > >> > Any ideas?
> > > >> >
> > > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <jb...@apache.org>
> > wrote:
> > > >> > >
> > > >> > > If it's simpler and documented that sounds like a win to me.
> > > >> > >
> > > >> > >
> > > >> > > Justin
> > > >> > >
> > > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> > robbie.gemmell@gmail.com>
> > > >> > > wrote:
> > > >> > >
> > > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> > clebert.suconic@gmail.com>
> > > >> > > > wrote:
> > > >> > > > >
> > > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> > robbie.gemmell@gmail.com>
> > > >> > > > wrote:
> > > >> > > > > > Thats what we do at Qpid and what I've seen other
> > > >> > > > > > projects do, I find it simpler overall.
> > > >> > > > >
> > > >> > > > > Tl;DR:
> > > >> > > > > I'm all +10000000 on this... what we need to change on infra.
> > > >> > > > >
> > > >> > > > > Can we keep the history from master
> > > >> > > >
> > > >> > > >
> > > >> > > > We wouldnt need to change much to get everything on the same
> > branch I
> > > >> > > > dont think, and it seems like we can do so without infra: I
> > just tried
> > > >> > > > on your last commit as a test and was able to force-push the
> > asf-site
> > > >> > > > branch in the website repo.
> > > >> > > >
> > > >> > > > So basically it seems it needs something like: repopulate the
> > asf-site
> > > >> > > > branch (or a test branch) with the master history locally,
> > simplify
> > > >> > > > the build script to only build and nothing else, fix up the
> > .gitignore
> > > >> > > > file appropriately, build things, commit, and [force] push.
> > > >> > > >
> > > >> > > > Assuming of course others agree that it is what should happen?
> > > >> > > >
> > > >> > > > Robbie
> > > >> > > >
> > > >> >
> > > >> >
> > > >> >
> > > >> > --
> > > >> > Clebert Suconic
> > > >
> > > > --
> > > > Clebert Suconic
> > >
> > >
> > >
> > > --
> > > Clebert Suconic
> >
> --
> Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
Should we move it then ?
On Fri, Oct 4, 2019 at 4:52 AM Robbie Gemmell <ro...@gmail.com>
wrote:
> What you did is just what the exiting build script did, so that should
> be fine if it was previously. I tried with and without the
> --incremental and it didnt make a difference here (wasn't much
> different time wise either). Strange that you saw this, and strange
> you now dont, but at least its working now.
>
> On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <cl...@gmail.com>
> wrote:
> >
> > I did not see the error again. I guess it was an effect of working
> > late hours.. I messed something up.
> >
> > I was playing with --incremental on jekyll perhaps that's what caused it.
> >
> >
> > Playing with a single branch would make it a lot easier. It bothers me
> > to keep moving between branches as my IDE gets crazy on indexing files
> > (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> > though ;) )
> >
> >
> > If more people could double check this is okay.. perhaps we can
> > replace asf-site by my test branch.
> >
> > On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> > <cl...@gmail.com> wrote:
> > >
> > > I copied the folder from the branch.
> > >
> > > Check out asf-siite
> > > Move it.
> > >
> > >
> > > Checkout the test branch
> > >
> > >
> > > Moved it back.
> > >
> > >
> > >
> > > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <
> robbie.gemmell@gmail.com> wrote:
> > >>
> > >> I dont see that happen when I run the build, and hadnt actually ever
> > >> seen the 'typechange' file status before.
> > >>
> > >> The content/schema/core/activemq-core.xsd is actually a symlink, and
> > >> some googling suggests the 'typechange' status mainly happens when
> > >> such link is replaced with an actual file. If I do that deliberately,
> > >> I then see the same status you do. Some posts suggested it can happen
> > >> with certain copy commands, that have dereferenced the link and copied
> > >> the referenced files content. How did you initially populate the
> > >> 'content' dir your subsequent status is showing as being updated?
> > >> Running the build afresh, or copying prior build output?
> > >>
> > >> Robbie
> > >>
> > >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <
> clebert.suconic@gmail.com> wrote:
> > >> >
> > >> > I have a branch where I'm using a single branch:
> > >> >
> > >> > https://github.com/clebertsuconic/activemq-website/tree/test
> > >> >
> > >> >
> > >> > The only concern I have so far is that any time I build, I get a
> > >> > change into a schema:
> > >> >
> > >> > Changes not staged for commit:
> > >> > (use "git add <file>..." to update what will be committed)
> > >> > (use "git checkout -- <file>..." to discard changes in working
> directory)
> > >> >
> > >> > typechange: content/schema/core/activemq-core.xsd
> > >> >
> > >> >
> > >> >
> > >> > Although I would consider that anyone would check stuff before
> committing..
> > >> >
> > >> > Any ideas?
> > >> >
> > >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <jb...@apache.org>
> wrote:
> > >> > >
> > >> > > If it's simpler and documented that sounds like a win to me.
> > >> > >
> > >> > >
> > >> > > Justin
> > >> > >
> > >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> robbie.gemmell@gmail.com>
> > >> > > wrote:
> > >> > >
> > >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> clebert.suconic@gmail.com>
> > >> > > > wrote:
> > >> > > > >
> > >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> robbie.gemmell@gmail.com>
> > >> > > > wrote:
> > >> > > > > > Thats what we do at Qpid and what I've seen other
> > >> > > > > > projects do, I find it simpler overall.
> > >> > > > >
> > >> > > > > Tl;DR:
> > >> > > > > I'm all +10000000 on this... what we need to change on infra.
> > >> > > > >
> > >> > > > > Can we keep the history from master
> > >> > > >
> > >> > > >
> > >> > > > We wouldnt need to change much to get everything on the same
> branch I
> > >> > > > dont think, and it seems like we can do so without infra: I
> just tried
> > >> > > > on your last commit as a test and was able to force-push the
> asf-site
> > >> > > > branch in the website repo.
> > >> > > >
> > >> > > > So basically it seems it needs something like: repopulate the
> asf-site
> > >> > > > branch (or a test branch) with the master history locally,
> simplify
> > >> > > > the build script to only build and nothing else, fix up the
> .gitignore
> > >> > > > file appropriately, build things, commit, and [force] push.
> > >> > > >
> > >> > > > Assuming of course others agree that it is what should happen?
> > >> > > >
> > >> > > > Robbie
> > >> > > >
> > >> >
> > >> >
> > >> >
> > >> > --
> > >> > Clebert Suconic
> > >
> > > --
> > > Clebert Suconic
> >
> >
> >
> > --
> > Clebert Suconic
>
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
What you did is just what the exiting build script did, so that should
be fine if it was previously. I tried with and without the
--incremental and it didnt make a difference here (wasn't much
different time wise either). Strange that you saw this, and strange
you now dont, but at least its working now.
On Thu, 3 Oct 2019 at 22:07, Clebert Suconic <cl...@gmail.com> wrote:
>
> I did not see the error again. I guess it was an effect of working
> late hours.. I messed something up.
>
> I was playing with --incremental on jekyll perhaps that's what caused it.
>
>
> Playing with a single branch would make it a lot easier. It bothers me
> to keep moving between branches as my IDE gets crazy on indexing files
> (don't ask.. I prefer IDE than VIM... I use vim emulation on idea
> though ;) )
>
>
> If more people could double check this is okay.. perhaps we can
> replace asf-site by my test branch.
>
> On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
> <cl...@gmail.com> wrote:
> >
> > I copied the folder from the branch.
> >
> > Check out asf-siite
> > Move it.
> >
> >
> > Checkout the test branch
> >
> >
> > Moved it back.
> >
> >
> >
> > On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <ro...@gmail.com> wrote:
> >>
> >> I dont see that happen when I run the build, and hadnt actually ever
> >> seen the 'typechange' file status before.
> >>
> >> The content/schema/core/activemq-core.xsd is actually a symlink, and
> >> some googling suggests the 'typechange' status mainly happens when
> >> such link is replaced with an actual file. If I do that deliberately,
> >> I then see the same status you do. Some posts suggested it can happen
> >> with certain copy commands, that have dereferenced the link and copied
> >> the referenced files content. How did you initially populate the
> >> 'content' dir your subsequent status is showing as being updated?
> >> Running the build afresh, or copying prior build output?
> >>
> >> Robbie
> >>
> >> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <cl...@gmail.com> wrote:
> >> >
> >> > I have a branch where I'm using a single branch:
> >> >
> >> > https://github.com/clebertsuconic/activemq-website/tree/test
> >> >
> >> >
> >> > The only concern I have so far is that any time I build, I get a
> >> > change into a schema:
> >> >
> >> > Changes not staged for commit:
> >> > (use "git add <file>..." to update what will be committed)
> >> > (use "git checkout -- <file>..." to discard changes in working directory)
> >> >
> >> > typechange: content/schema/core/activemq-core.xsd
> >> >
> >> >
> >> >
> >> > Although I would consider that anyone would check stuff before committing..
> >> >
> >> > Any ideas?
> >> >
> >> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <jb...@apache.org> wrote:
> >> > >
> >> > > If it's simpler and documented that sounds like a win to me.
> >> > >
> >> > >
> >> > > Justin
> >> > >
> >> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <ro...@gmail.com>
> >> > > wrote:
> >> > >
> >> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <cl...@gmail.com>
> >> > > > wrote:
> >> > > > >
> >> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <ro...@gmail.com>
> >> > > > wrote:
> >> > > > > > Thats what we do at Qpid and what I've seen other
> >> > > > > > projects do, I find it simpler overall.
> >> > > > >
> >> > > > > Tl;DR:
> >> > > > > I'm all +10000000 on this... what we need to change on infra.
> >> > > > >
> >> > > > > Can we keep the history from master
> >> > > >
> >> > > >
> >> > > > We wouldnt need to change much to get everything on the same branch I
> >> > > > dont think, and it seems like we can do so without infra: I just tried
> >> > > > on your last commit as a test and was able to force-push the asf-site
> >> > > > branch in the website repo.
> >> > > >
> >> > > > So basically it seems it needs something like: repopulate the asf-site
> >> > > > branch (or a test branch) with the master history locally, simplify
> >> > > > the build script to only build and nothing else, fix up the .gitignore
> >> > > > file appropriately, build things, commit, and [force] push.
> >> > > >
> >> > > > Assuming of course others agree that it is what should happen?
> >> > > >
> >> > > > Robbie
> >> > > >
> >> >
> >> >
> >> >
> >> > --
> >> > Clebert Suconic
> >
> > --
> > Clebert Suconic
>
>
>
> --
> Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
I did not see the error again. I guess it was an effect of working
late hours.. I messed something up.
I was playing with --incremental on jekyll perhaps that's what caused it.
Playing with a single branch would make it a lot easier. It bothers me
to keep moving between branches as my IDE gets crazy on indexing files
(don't ask.. I prefer IDE than VIM... I use vim emulation on idea
though ;) )
If more people could double check this is okay.. perhaps we can
replace asf-site by my test branch.
On Thu, Oct 3, 2019 at 3:09 PM Clebert Suconic
<cl...@gmail.com> wrote:
>
> I copied the folder from the branch.
>
> Check out asf-siite
> Move it.
>
>
> Checkout the test branch
>
>
> Moved it back.
>
>
>
> On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <ro...@gmail.com> wrote:
>>
>> I dont see that happen when I run the build, and hadnt actually ever
>> seen the 'typechange' file status before.
>>
>> The content/schema/core/activemq-core.xsd is actually a symlink, and
>> some googling suggests the 'typechange' status mainly happens when
>> such link is replaced with an actual file. If I do that deliberately,
>> I then see the same status you do. Some posts suggested it can happen
>> with certain copy commands, that have dereferenced the link and copied
>> the referenced files content. How did you initially populate the
>> 'content' dir your subsequent status is showing as being updated?
>> Running the build afresh, or copying prior build output?
>>
>> Robbie
>>
>> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <cl...@gmail.com> wrote:
>> >
>> > I have a branch where I'm using a single branch:
>> >
>> > https://github.com/clebertsuconic/activemq-website/tree/test
>> >
>> >
>> > The only concern I have so far is that any time I build, I get a
>> > change into a schema:
>> >
>> > Changes not staged for commit:
>> > (use "git add <file>..." to update what will be committed)
>> > (use "git checkout -- <file>..." to discard changes in working directory)
>> >
>> > typechange: content/schema/core/activemq-core.xsd
>> >
>> >
>> >
>> > Although I would consider that anyone would check stuff before committing..
>> >
>> > Any ideas?
>> >
>> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <jb...@apache.org> wrote:
>> > >
>> > > If it's simpler and documented that sounds like a win to me.
>> > >
>> > >
>> > > Justin
>> > >
>> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <ro...@gmail.com>
>> > > wrote:
>> > >
>> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <cl...@gmail.com>
>> > > > wrote:
>> > > > >
>> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <ro...@gmail.com>
>> > > > wrote:
>> > > > > > Thats what we do at Qpid and what I've seen other
>> > > > > > projects do, I find it simpler overall.
>> > > > >
>> > > > > Tl;DR:
>> > > > > I'm all +10000000 on this... what we need to change on infra.
>> > > > >
>> > > > > Can we keep the history from master
>> > > >
>> > > >
>> > > > We wouldnt need to change much to get everything on the same branch I
>> > > > dont think, and it seems like we can do so without infra: I just tried
>> > > > on your last commit as a test and was able to force-push the asf-site
>> > > > branch in the website repo.
>> > > >
>> > > > So basically it seems it needs something like: repopulate the asf-site
>> > > > branch (or a test branch) with the master history locally, simplify
>> > > > the build script to only build and nothing else, fix up the .gitignore
>> > > > file appropriately, build things, commit, and [force] push.
>> > > >
>> > > > Assuming of course others agree that it is what should happen?
>> > > >
>> > > > Robbie
>> > > >
>> >
>> >
>> >
>> > --
>> > Clebert Suconic
>
> --
> Clebert Suconic
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
I copied the folder from the branch.
Check out asf-siite
Move it.
Checkout the test branch
Moved it back.
On Thu, Oct 3, 2019 at 7:31 AM Robbie Gemmell <ro...@gmail.com>
wrote:
> I dont see that happen when I run the build, and hadnt actually ever
> seen the 'typechange' file status before.
>
> The content/schema/core/activemq-core.xsd is actually a symlink, and
> some googling suggests the 'typechange' status mainly happens when
> such link is replaced with an actual file. If I do that deliberately,
> I then see the same status you do. Some posts suggested it can happen
> with certain copy commands, that have dereferenced the link and copied
> the referenced files content. How did you initially populate the
> 'content' dir your subsequent status is showing as being updated?
> Running the build afresh, or copying prior build output?
>
> Robbie
>
> On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <cl...@gmail.com>
> wrote:
> >
> > I have a branch where I'm using a single branch:
> >
> > https://github.com/clebertsuconic/activemq-website/tree/test
> >
> >
> > The only concern I have so far is that any time I build, I get a
> > change into a schema:
> >
> > Changes not staged for commit:
> > (use "git add <file>..." to update what will be committed)
> > (use "git checkout -- <file>..." to discard changes in working
> directory)
> >
> > typechange: content/schema/core/activemq-core.xsd
> >
> >
> >
> > Although I would consider that anyone would check stuff before
> committing..
> >
> > Any ideas?
> >
> > On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <jb...@apache.org>
> wrote:
> > >
> > > If it's simpler and documented that sounds like a win to me.
> > >
> > >
> > > Justin
> > >
> > > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <
> robbie.gemmell@gmail.com>
> > > wrote:
> > >
> > > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <
> clebert.suconic@gmail.com>
> > > > wrote:
> > > > >
> > > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <
> robbie.gemmell@gmail.com>
> > > > wrote:
> > > > > > Thats what we do at Qpid and what I've seen other
> > > > > > projects do, I find it simpler overall.
> > > > >
> > > > > Tl;DR:
> > > > > I'm all +10000000 on this... what we need to change on infra.
> > > > >
> > > > > Can we keep the history from master
> > > >
> > > >
> > > > We wouldnt need to change much to get everything on the same branch I
> > > > dont think, and it seems like we can do so without infra: I just
> tried
> > > > on your last commit as a test and was able to force-push the asf-site
> > > > branch in the website repo.
> > > >
> > > > So basically it seems it needs something like: repopulate the
> asf-site
> > > > branch (or a test branch) with the master history locally, simplify
> > > > the build script to only build and nothing else, fix up the
> .gitignore
> > > > file appropriately, build things, commit, and [force] push.
> > > >
> > > > Assuming of course others agree that it is what should happen?
> > > >
> > > > Robbie
> > > >
> >
> >
> >
> > --
> > Clebert Suconic
>
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
I dont see that happen when I run the build, and hadnt actually ever
seen the 'typechange' file status before.
The content/schema/core/activemq-core.xsd is actually a symlink, and
some googling suggests the 'typechange' status mainly happens when
such link is replaced with an actual file. If I do that deliberately,
I then see the same status you do. Some posts suggested it can happen
with certain copy commands, that have dereferenced the link and copied
the referenced files content. How did you initially populate the
'content' dir your subsequent status is showing as being updated?
Running the build afresh, or copying prior build output?
Robbie
On Wed, 2 Oct 2019 at 22:53, Clebert Suconic <cl...@gmail.com> wrote:
>
> I have a branch where I'm using a single branch:
>
> https://github.com/clebertsuconic/activemq-website/tree/test
>
>
> The only concern I have so far is that any time I build, I get a
> change into a schema:
>
> Changes not staged for commit:
> (use "git add <file>..." to update what will be committed)
> (use "git checkout -- <file>..." to discard changes in working directory)
>
> typechange: content/schema/core/activemq-core.xsd
>
>
>
> Although I would consider that anyone would check stuff before committing..
>
> Any ideas?
>
> On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <jb...@apache.org> wrote:
> >
> > If it's simpler and documented that sounds like a win to me.
> >
> >
> > Justin
> >
> > On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <ro...@gmail.com>
> > wrote:
> >
> > > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <cl...@gmail.com>
> > > wrote:
> > > >
> > > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <ro...@gmail.com>
> > > wrote:
> > > > > Thats what we do at Qpid and what I've seen other
> > > > > projects do, I find it simpler overall.
> > > >
> > > > Tl;DR:
> > > > I'm all +10000000 on this... what we need to change on infra.
> > > >
> > > > Can we keep the history from master
> > >
> > >
> > > We wouldnt need to change much to get everything on the same branch I
> > > dont think, and it seems like we can do so without infra: I just tried
> > > on your last commit as a test and was able to force-push the asf-site
> > > branch in the website repo.
> > >
> > > So basically it seems it needs something like: repopulate the asf-site
> > > branch (or a test branch) with the master history locally, simplify
> > > the build script to only build and nothing else, fix up the .gitignore
> > > file appropriately, build things, commit, and [force] push.
> > >
> > > Assuming of course others agree that it is what should happen?
> > >
> > > Robbie
> > >
>
>
>
> --
> Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
I have a branch where I'm using a single branch:
https://github.com/clebertsuconic/activemq-website/tree/test
The only concern I have so far is that any time I build, I get a
change into a schema:
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
typechange: content/schema/core/activemq-core.xsd
Although I would consider that anyone would check stuff before committing..
Any ideas?
On Wed, Oct 2, 2019 at 1:03 PM Justin Bertram <jb...@apache.org> wrote:
>
> If it's simpler and documented that sounds like a win to me.
>
>
> Justin
>
> On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <ro...@gmail.com>
> wrote:
>
> > On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <cl...@gmail.com>
> > wrote:
> > >
> > > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <ro...@gmail.com>
> > wrote:
> > > > Thats what we do at Qpid and what I've seen other
> > > > projects do, I find it simpler overall.
> > >
> > > Tl;DR:
> > > I'm all +10000000 on this... what we need to change on infra.
> > >
> > > Can we keep the history from master
> >
> >
> > We wouldnt need to change much to get everything on the same branch I
> > dont think, and it seems like we can do so without infra: I just tried
> > on your last commit as a test and was able to force-push the asf-site
> > branch in the website repo.
> >
> > So basically it seems it needs something like: repopulate the asf-site
> > branch (or a test branch) with the master history locally, simplify
> > the build script to only build and nothing else, fix up the .gitignore
> > file appropriately, build things, commit, and [force] push.
> >
> > Assuming of course others agree that it is what should happen?
> >
> > Robbie
> >
--
Clebert Suconic
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Justin Bertram <jb...@apache.org>.
If it's simpler and documented that sounds like a win to me.
Justin
On Wed, Oct 2, 2019 at 11:41 AM Robbie Gemmell <ro...@gmail.com>
wrote:
> On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <cl...@gmail.com>
> wrote:
> >
> > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <ro...@gmail.com>
> wrote:
> > > Thats what we do at Qpid and what I've seen other
> > > projects do, I find it simpler overall.
> >
> > Tl;DR:
> > I'm all +10000000 on this... what we need to change on infra.
> >
> > Can we keep the history from master
>
>
> We wouldnt need to change much to get everything on the same branch I
> dont think, and it seems like we can do so without infra: I just tried
> on your last commit as a test and was able to force-push the asf-site
> branch in the website repo.
>
> So basically it seems it needs something like: repopulate the asf-site
> branch (or a test branch) with the master history locally, simplify
> the build script to only build and nothing else, fix up the .gitignore
> file appropriately, build things, commit, and [force] push.
>
> Assuming of course others agree that it is what should happen?
>
> Robbie
>
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
On Wed, 2 Oct 2019 at 17:41, Robbie Gemmell <ro...@gmail.com> wrote:
>
> On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <cl...@gmail.com> wrote:
> >
> > On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > > Thats what we do at Qpid and what I've seen other
> > > projects do, I find it simpler overall.
> >
> > Tl;DR:
> > I'm all +10000000 on this... what we need to change on infra.
> >
> > Can we keep the history from master
>
>
> We wouldnt need to change much to get everything on the same branch I
> dont think, and it seems like we can do so without infra: I just tried
> on your last commit as a test and was able to force-push the asf-site
> branch in the website repo.
>
> So basically it seems it needs something like: repopulate the asf-site
> branch (or a test branch) with the master history locally, simplify
> the build script to only build and nothing else, fix up the .gitignore
> file appropriately, build things, commit, and [force] push.
>
> Assuming of course others agree that it is what should happen?
>
> Robbie
Actually, I forgot one thing, the repo default branch is set to
master, that would presumably need infra to update it to have the
default as asf-site..but that could be done separately from the actual
site changes.
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
On Wed, 2 Oct 2019 at 16:47, Clebert Suconic <cl...@gmail.com> wrote:
>
> On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <ro...@gmail.com> wrote:
> > Thats what we do at Qpid and what I've seen other
> > projects do, I find it simpler overall.
>
> Tl;DR:
> I'm all +10000000 on this... what we need to change on infra.
>
> Can we keep the history from master
We wouldnt need to change much to get everything on the same branch I
dont think, and it seems like we can do so without infra: I just tried
on your last commit as a test and was able to force-push the asf-site
branch in the website repo.
So basically it seems it needs something like: repopulate the asf-site
branch (or a test branch) with the master history locally, simplify
the build script to only build and nothing else, fix up the .gitignore
file appropriately, build things, commit, and [force] push.
Assuming of course others agree that it is what should happen?
Robbie
Re: Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Clebert Suconic <cl...@gmail.com>.
On Wed, Oct 2, 2019 at 10:44 AM Robbie Gemmell <ro...@gmail.com> wrote:
> Thats what we do at Qpid and what I've seen other
> projects do, I find it simpler overall.
Tl;DR:
I'm all +10000000 on this... what we need to change on infra.
Can we keep the history from master
Website build script [WAS Re: [activemq-website] 01/02: Adding
upstream checkout on build.sh]
Posted by Robbie Gemmell <ro...@gmail.com>.
Messing with the remotes and resetting branches in the build script
feels a bit icky.
Would an alternative be to just move the src dir into the asf-site
branch, so all the branch swapping and updating hoop jumping (and time
spent waiting on it) is eliminated? To update the site you would then
just make a source change or 10, optionally committing those only, and
at the end build (only build, no branch/commit/fetch hoop jumping),
commit, and push. Thats what we do at Qpid and what I've seen other
projects do, I find it simpler overall.
Robbie
On Wed, 2 Oct 2019 at 14:27, <cl...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> clebertsuconic pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/activemq-website.git
>
> commit ff6dec7412d49a0060932a54afbd656a3f7df5db
> Author: Clebert Suconic <cl...@apache.org>
> AuthorDate: Wed Oct 2 09:19:39 2019 -0400
>
> Adding upstream checkout on build.sh
> ---
> build.sh | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/build.sh b/build.sh
> index 1bcff33..9794d2d 100755
> --- a/build.sh
> +++ b/build.sh
> @@ -4,11 +4,15 @@ jekyll build -s ./src/ -d ./site-content
> COMMIT_HASH=`git rev-parse HEAD`
> COMMIT_MESSAGE=`git show -s --format=%s HEAD`
>
> +git remote add github-upstream https://github.com/apache/activemq-website.git
> +
> echo "Build of ActiveMQ site successful."
> -git checkout asf-site
> +git fetch github-upstream
> +git checkout github-upstream/asf-site -B asf-site
> rm -rf content
> mv site-content content
> git add content
> +git remote remove github-upstream
>
> echo "Commiting changes to asf-site branch from master branch."
> git commit --author "ActiveMQ Dev <de...@activemq.apache.org>" -m "$COMMIT_MESSAGE / built from commit $COMMIT_HASH"
>
[activemq-website] 01/02: Adding upstream checkout on build.sh
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git
commit ff6dec7412d49a0060932a54afbd656a3f7df5db
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Wed Oct 2 09:19:39 2019 -0400
Adding upstream checkout on build.sh
---
build.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 1bcff33..9794d2d 100755
--- a/build.sh
+++ b/build.sh
@@ -4,11 +4,15 @@ jekyll build -s ./src/ -d ./site-content
COMMIT_HASH=`git rev-parse HEAD`
COMMIT_MESSAGE=`git show -s --format=%s HEAD`
+git remote add github-upstream https://github.com/apache/activemq-website.git
+
echo "Build of ActiveMQ site successful."
-git checkout asf-site
+git fetch github-upstream
+git checkout github-upstream/asf-site -B asf-site
rm -rf content
mv site-content content
git add content
+git remote remove github-upstream
echo "Commiting changes to asf-site branch from master branch."
git commit --author "ActiveMQ Dev <de...@activemq.apache.org>" -m "$COMMIT_MESSAGE / built from commit $COMMIT_HASH"
[activemq-website] 02/02: Fixing past release links and download
date
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git
commit 38362cf4250b039bd3e0a681d511f51e0448171b
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Wed Oct 2 09:24:44 2019 -0400
Fixing past release links and download date
---
src/components/artemis/download/index.md | 2 +-
src/components/artemis/download/past_releases.md | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/artemis/download/index.md b/src/components/artemis/download/index.md
index 1dd6b7c..9444c35 100644
--- a/src/components/artemis/download/index.md
+++ b/src/components/artemis/download/index.md
@@ -9,7 +9,7 @@ These are the current releases from both major branches. For prior releases, ple
The keys file for verifying these releases can be obtained <a href="https://www.apache.org/dist/activemq/KEYS">here</a>.
-#### ActiveMQ Artemis 2.10.1 (September 23, 2019)
+#### ActiveMQ Artemis 2.10.1 (September 26, 2019)
[Release Notes](release-notes-2.10.1) | [Git Report](commit-report-2.10.1) | [Documentation](../documentation/latest)
tar.gz:|[apache-artemis-2.10.1-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis/2.10.1/apache-artemis-2.10.1-bin.tar.gz&action=download)|[SHA512](https://www.apache.org/dist/activemq/activemq-artemis/2.10.1/apache-artemis-2.10.1-bin.tar.gz.sha512)|[GPG Signature](https://www.apache.org/dist/activemq/activemq-artemis/2.10.1/apache-artemis-2.10.1-bin.tar.gz.asc)
diff --git a/src/components/artemis/download/past_releases.md b/src/components/artemis/download/past_releases.md
index cb009cd..91b5ad5 100644
--- a/src/components/artemis/download/past_releases.md
+++ b/src/components/artemis/download/past_releases.md
@@ -15,8 +15,8 @@ For any releases not shown here, check the [archive](https://archive.apache.org/
[Release Notes](release-notes-2.10.0) | [Git Report](commit-report-2.10.0) | [Documentation](../documentation/2.10.0)
tar.gz:|[apache-artemis-2.10.0-bin.tar.gz](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-bin.tar.gz)|[SHA512](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-bin.tar.gz.sha512)|[GPG Signature](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-bin.tar.gz.asc)
-ZIP:|[apache-artemis-2.10.0-bin.zip](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-bin.zip)|[SHA512](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-bin.zip.sha512)|[GPG Signature](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.9.0-bin.zip.asc)
-Source Distribution:|[apache-artemis-2.10.0-source-release.tar.gz](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-source-release.tar.gz)|[SHA512](https://archive.apache.org/dist/activemq/activemq-artemis/2.9.0/apache-artemis-2.9.0-source-release.tar.gz.sha512)|[GPG Signature](https://archive.apache.org/dist/activemq/activemq-artemis/2.9.0/apache-artemis-2.9.0-source-release.tar.gz.asc)|
+ZIP:|[apache-artemis-2.10.0-bin.zip](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-bin.zip)|[SHA512](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-bin.zip.sha512)|[GPG Signature](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-bin.zip.asc)
+Source Distribution:|[apache-artemis-2.10.0-source-release.tar.gz](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-source-release.tar.gz)|[SHA512](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-source-release.tar.gz.sha512)|[GPG Signature](https://archive.apache.org/dist/activemq/activemq-artemis/2.10.0/apache-artemis-2.10.0-source-release.tar.gz.asc)|
<br/>
#### ActiveMQ Artemis 2.9.0 (June 6, 2019)