git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 0/6] Asciidoctor-related formatting and CI fixes

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Mar 29, 2019, 15:56 UTC
Message-ID
<nycvar.QRO.7.76.6.1903291653590.41@tvgsbejvaqbjf.bet>
In-Reply-To
<20190329123520.27549-1-szeder.dev@gmail.com>
Hi,
On Fri, 29 Mar 2019, SZEDER Gábor wrote:
Show 19 quoted lines
> [...]
>   - Mention in patch 4's commit message that Asciidoctor is still only
>     installed in the Documentation build job.
> [...]
>
> Range-diff:
> 1:  8026f62876 = 1:  8026f62876 Documentation/git-diff-tree.txt: fix formatting
> 2:  fd19cf4b24 = 2:  fd19cf4b24 Documentation/technical/api-config.txt: fix formatting
> 3:  638dcd64e9 = 3:  638dcd64e9 Documentation/technical/protocol-v2.txt: fix formatting
> 4:  6f8c6ff398 ! 4:  2e94e2b7b6 ci: install Asciidoctor in 'ci/install-dependencies.sh'
>     @@ -6,8 +6,9 @@
>          installation of the 'asciidoctor' gem somehow ended up in
>          'ci/test-documentation.sh'.
>
>     -    Install it in 'ci/install-dependencies.sh', where we install
>     -    everything else.
>     +    Install it in 'ci/install-dependencies.sh', where we install other
>     +    dependencies of the Documentation build job as well (asciidoc,
>     +    xmlto).

I would have wished for something that more explicitly said that it still *only* installs it for the Documentation job.

But I can live with the current wording.
Show 51 quoted lines
>          [1] 657343a602 (travis-ci: move Travis CI code into dedicated scripts,
>              2017-09-10)
> [...]
>
>     @@ -66,15 +77,32 @@
>       +++ b/ci/test-documentation.sh
>      @@
>
>     + . ${0%/*}/lib.sh
>     +
>     ++filter_log () {
>     ++	sed -e '/^GIT_VERSION = /d' \
>     ++	    -e '/^    \* new asciidoc flags$/d' \
>     ++	    "$1"
>     ++}
>     ++
>     + make check-builtins
>     + make check-docs
>     +
>       # Build docs with AsciiDoc
>     - make doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
>     +-make doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
>      -! test -s stderr.log
>     -+cat stderr.log
>     ++make doc > >(tee stdout.log) 2> >(tee stderr.raw >&2)
>     ++cat stderr.raw
>     ++filter_log stderr.raw >stderr.log
>      +test ! -s stderr.log
>       test -s Documentation/git.html
>       test -s Documentation/git.xml
>       test -s Documentation/git.1
>     -@@
>     + grep '<meta name="generator" content="AsciiDoc ' Documentation/git.html
>     +
>     +-rm -f stdout.log stderr.log
>     ++rm -f stdout.log stderr.log stderr.raw
>     + check_unignored_build_artifacts
>
>       # Build docs with AsciiDoctor
>       make clean
>     @@ -82,8 +110,8 @@
>      -sed '/^GIT_VERSION = / d' stderr.log
>      -! test -s stderr.log
>      +make USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.raw >&2)
>     -+sed '/^GIT_VERSION = / d' stderr.raw >stderr.log
>     -+cat stderr.log
>     ++cat stderr.raw
>     ++filter_log stderr.raw >stderr.log
>      +test ! -s stderr.log
>       test -s Documentation/git.html
>       grep '<meta name="generator" content="Asciidoctor ' Documentation/git.html

Wow. Subtle. And a bit hard to read without color ;-) But from what I understand, this does the right thing.

So from my side, this patch series is good to go!

Thanks, Dscho

Previous: SZEDER Gábor
Message 25 of 25 in “Documentation/git-diff-tree.txt: fix formatting”
  1. 1/3 Documentation/git-diff-tree.txt: fix formattingSZEDER Gábor, Mar 24, 2019
  2. 2/3 Documentation/technical/api-config.txt: fix formattingSZEDER Gábor, Mar 24, 2019
  3. 3/3 Documentation/technical/protocol-v2.txt: fix formattingSZEDER Gábor, Mar 24, 2019
  4. SZEDER GáborMar 24, 2019
  5. 0/6 Asciidoctor-related formatting and CI fixesSZEDER Gábor, Mar 24, 2019
  6. 1/6 Documentation/git-diff-tree.txt: fix formattingSZEDER Gábor, Mar 24, 2019
  7. 2/6 Documentation/technical/api-config.txt: fix formattingSZEDER Gábor, Mar 24, 2019
  8. 3/6 Documentation/technical/protocol-v2.txt: fix formattingSZEDER Gábor, Mar 24, 2019
  9. 4/6 ci: install Asciidoctor in 'ci/install-dependencies.sh'SZEDER Gábor, Mar 24, 2019
  10. Johannes SchindelinMar 25, 2019
  11. SZEDER GáborMar 25, 2019
  12. Johannes SchindelinMar 26, 2019
  13. 6/6 ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build jobSZEDER Gábor, Mar 24, 2019
  14. 5/6 ci: stick with Asciidoctor v1.5.8 for nowSZEDER Gábor, Mar 24, 2019
  15. Jeff KingMar 26, 2019
  16. 0/6 Asciidoctor-related formatting and CI fixesSZEDER Gábor, Mar 29, 2019
  17. 1/6 Documentation/git-diff-tree.txt: fix formattingSZEDER Gábor, Mar 29, 2019
  18. 2/6 Documentation/technical/api-config.txt: fix formattingSZEDER Gábor, Mar 29, 2019
  19. 4/6 ci: install Asciidoctor in 'ci/install-dependencies.sh'SZEDER Gábor, Mar 29, 2019
  20. 3/6 Documentation/technical/protocol-v2.txt: fix formattingSZEDER Gábor, Mar 29, 2019
  21. 5/6 ci: stick with Asciidoctor v1.5.8 for nowSZEDER Gábor, Mar 29, 2019
  22. 5/6 ci: stick with Asciidoctor v1.5.8 for nowSZEDER Gábor, Mar 29, 2019
  23. Martin ÅgrenApr 3, 2019
  24. 6/6 ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build jobSZEDER Gábor, Mar 29, 2019
  25. Johannes SchindelinMar 29, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.