travis-ci: build documentation with AsciiDoc and Asciidoctor

ec3366e introduced a knob to enable the use of Asciidoctor in addition to AsciiDoc. Build the documentation on TravisCI with this knob to reduce the likeliness of breaking Asciidoctor support in the future. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Lars Schneider committed Apr 11, 2017 at 10:33 UTC 159e6010c2d586acea9704993971365a804ea1ce
2 files changed +10 -2
.travis.yml
+1 -1
@@ -69,7 +69,7 @@ matrix:
69 - asciidoc
70 - xmlto
71 before_install:
72 - before_script:
72 + before_script: gem install asciidoctor
73 script: ci/test-documentation.sh
74 after_failure:
75
ci/test-documentation.sh
+9 -1
@@ -7,8 +7,16 @@ set -e
7
8 make check-builtins
9 make check-docs
10 -make doc
10
11 +# Build docs with AsciiDoc
12 +make doc
13 test -s Documentation/git.html
14 test -s Documentation/git.xml
15 test -s Documentation/git.1
16 +grep '<meta name="generator" content="AsciiDoc ' Documentation/git.html
17 +
18 +# Build docs with AsciiDoctor
19 +make clean
20 +make USE_ASCIIDOCTOR=1 doc
21 +test -s Documentation/git.html
22 +grep '<meta name="generator" content="Asciidoctor ' Documentation/git.html