Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2017-04-11 11:33:07 +0300
committerJunio C Hamano <gitster@pobox.com>2017-04-17 03:27:56 +0300
commit159e6010c2d586acea9704993971365a804ea1ce (patch)
treed35f400143673a60293fe8caba890a7a562fd334 /ci
parent49800c940790cc7465d1b03e08d472ffd8684808 (diff)
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>
Diffstat (limited to 'ci')
-rwxr-xr-xci/test-documentation.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
index 579d540d32..bf23b2caea 100755
--- a/ci/test-documentation.sh
+++ b/ci/test-documentation.sh
@@ -7,8 +7,16 @@ set -e
make check-builtins
make check-docs
-make doc
+# Build docs with AsciiDoc
+make doc
test -s Documentation/git.html
test -s Documentation/git.xml
test -s Documentation/git.1
+grep '<meta name="generator" content="AsciiDoc ' Documentation/git.html
+
+# Build docs with AsciiDoctor
+make clean
+make USE_ASCIIDOCTOR=1 doc
+test -s Documentation/git.html
+grep '<meta name="generator" content="Asciidoctor ' Documentation/git.html