Not seeing a lot of feedback here, so as there did seem to be support for an automated build in the earlier thread....lazy consensus notice:
Lacking further discussion otherwise, I will change the website repo tomorrow to: - Update the existing branch to contain only the sources. - Use the asf-site branch for the published site output. - Build automatically in CI on pushing source changes and commit ouput to the asf-site branch for immediate live publish. - Remove the staging branch again (clearing the stale staging content beforehand). Robbie On Fri, 24 Jul 2020 at 09:22, Robbie Gemmell <[email protected]> wrote: > > That's just how it is set up currently, and how I've seen other > projects use it so far. I guess because it gives them a chance to vet > what is built elsewhere before it goes live, and allows the > possibility for people to still change things while not able to build > locally. > > What we actually do is part of what this discussion is about, I > mentioned potentially going straight to publishing live as an option > in the original mail. > > On Thu, 23 Jul 2020 at 18:25, Clebert Suconic <[email protected]> > wrote: > > > > let me try to understand, your intention is to still have the staged > > website as part of the build? > > > > Why not publish it straight away? we can all test it locally before > > pushing a commit? > > > > On Thu, Jul 23, 2020 at 12:53 PM Robbie Gemmell > > <[email protected]> wrote: > > > > > > Readme updated on the jekyll-test-master branch. > > > > > > On Thu, 23 Jul 2020 at 17:17, Robbie Gemmell <[email protected]> > > > wrote: > > > > > > > > Feel free to commit anything to try, it is only going to the staging > > > > area so there is no issue - I put my test changes right in the middle > > > > of the front page hehe. > > > > > > > > All staged bits are hosted under .staged.apache.org. The 'no-value' ~ > > > > setting for the profile in the staging section of .asf.yaml means 'use > > > > http://<project>.staged.apache.org': > > > > https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features#git.asf.yamlfeatures-Stagingawebsitepreviewdomain > > > > > > > > Yep, you can still build and serve the site locally as before, and I'd > > > > expect people should do that before committing regardless whether or > > > > not we use the staging area as an intermediate step. The only > > > > difference there is that it now builds into the _site folder like > > > > Jekyll builds normally do by default, since the automated build > > > > requires it and it seemed better to be consistent with that. The dir > > > > is in the .gitignore and you wouldn't commit the generated output > > > > either way, only the src subdir changes. > > > > > > > > I didn't update the readme but I can tweak that now to make it more > > > > obvious for now until we decide what to do. > > > > > > > > Robbie > > > > > > > > On Thu, 23 Jul 2020 at 16:23, Clebert Suconic > > > > <[email protected]> wrote: > > > > > > > > > > +1000 > > > > > > > > > > > > > > > Just looked at the branches.. i didn't commit anything.. > > > > > > > > > > > > > > > one question I had is that on the asf-staging, the .asf.yaml doesn't > > > > > make any reference to staged.. how did it become activemq.staged and > > > > > not asf-staging? > > > > > > > > > > and the other thing is: the only thing I really care about.. is we > > > > > should still have the hability to test the changes before committing, > > > > > and i see that the current test branch has that... as long as we keep > > > > > that... I'm +1000 for this.. nice job!) > > > > > > > > > > > > > > > On Wed, Jul 22, 2020 at 2:41 PM Robbie Gemmell > > > > > <[email protected]> wrote: > > > > > > > > > > > > Following on from an earlier thread around Jekyll versions and build > > > > > > issues etc, I have just gone through the hoops with infra and put an > > > > > > automated website build in place for a trial and discussion. Folks > > > > > > can > > > > > > now give it a try out and we could decide if it or a variant is > > > > > > desirable to use going forward. > > > > > > > > > > > > Any source changes committed to the jekyll-test-master branch of the > > > > > > website repo will currently be automatically built, committed to the > > > > > > asf-staging branch, and staged to > > > > > > https://activemq.staged.apache.org/. > > > > > > The process can take a few minutes as the site is so large. > > > > > > > > > > > > With this setup you would e.g check all is well in staging, and then > > > > > > rebase a further live branch (e.g asf-site) in the repo with the > > > > > > staged commits from asf-staging and push there. Alternatively it > > > > > > could > > > > > > just build straight to the live branch without any staging (I used > > > > > > the > > > > > > staging area as it is a test, and it was already sitting there from > > > > > > last year). > > > > > > > > > > > > E.g I made this change on jekyll-test-master: > > > > > > https://github.com/apache/activemq-website/commit/c958e5042d7a4c095db351cfb3cf388c6711037b > > > > > > > > > > > > which was built automatically in: > > > > > > https://ci2.apache.org/#/builders/7/builds/145 > > > > > > > > > > > > then output committed back to the asf-staging branch in: > > > > > > https://github.com/apache/activemq-website/commit/103dc43c8f77a101fca7ad82f225da8efc7c5945 > > > > > > > > > > > > and is now visible in the text on the front at > > > > > > https://activemq.staged.apache.org/ > > > > > > > > > > > > Thoughts? > > > > > > > > > > > > Robbie > > > > > > > > > > > > > > > > > > > > -- > > > > > Clebert Suconic > > > > > > > > -- > > Clebert Suconic
