-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sitedoc.sh uses bash var. substring #283
Conversation
An automated preview of the documentation is available at https://283.site-docs.prtest2.cppalliance.org/contributor-guide/index.html |
An automated preview of the documentation is available at https://283.site-docs.prtest2.cppalliance.org/contributor-guide/index.html |
An automated preview of the documentation is available at https://283.site-docs.prtest2.cppalliance.org/contributor-guide/index.html |
Oh... that's bad. lol Yes. We need your
The answer to the second question is a bit longer. Vinnie came up with some conventions when we wrote this, and there is even a plugin that allows us to write macros to apply these conventions. Anyway, one of the conventions is that "sitedocs" would be unversioned. Although Antora usually generates many versions of the same website for relevant branches and tags, In other words, this is wrong: website-v2-docs/site.playbook.yml Lines 58 to 68 in 7b6fb65
because it doesn't set which branches should be generated. By not setting the branches, they default to The usual solution for this in Antora, and what we have been doing before for other projects, like MrDocs and Boost.URL, would be to have two playbooks: a Fortunately, I solved this problem recently for MrDocs: https://github.com/cppalliance/mrdocs/tree/develop/docs We achieved the same thing there a single antora-playbook.yml in there and the scripts build_docs.sh and build_local_docs.sh look almost identical. To do the same thing here, we add this extension I wrote to the playbook where the |
@alandefreitas , your reply was detailed, and at the moment I am not following the thread. Which leads through mrdocs, antora, command-line options, and so on. That's ok. How about this: Pull request 283 only fixes the macOS issue (which I believe it does.) Done.
or
|
Sure. I was answering the two questions you made but they are independent from the PR. The PR looks good to me. |
This PR changes a line in sitedoc.sh to support macOS . Requires bash shell.
@alandefreitas , the web developers faced some confusion when following the README instructions. Consider this section:
Question 1: maybe it should it say this instead? (not sure, see next question also.)
./sitedoc.sh develop
# or
./sitedoc.sh master
They were running exactly what was written. Both commands:
./sitedoc.sh develop
./sitedoc.sh master
Question 2:
The contents of the S3 bucket has a master/ and a develop/ subdirectory. Notice in the example output there is coincidentally a path "build/develop". It makes it seem like there will be output in "build/master" and "build/develop", which matches what should be uploaded to S3. But in fact, that may be a coincidence, and really the sitedoc.sh output simply goes into "build". It may be not-obvious to write this sentence "path to antora build docs" in the format of a directory listing "/path/to/antora/build/develop/doc". It could more realistically say "/home/user/website-v2-docs/build". Will both master and develop builds go into the build directory, overwriting each other? Or, do master and develop builds have separate destination directories? what are they, by default? Are they overwriting each other, both in build/ ?