diff options
| author | Lars Schneider <larsxschneider@gmail.com> | 2017-04-11 10:33:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-16 17:27:56 -0700 |
| commit | 159e6010c2d586acea9704993971365a804ea1ce (patch) | |
| tree | d35f400143673a60293fe8caba890a7a562fd334 | |
| parent | 49800c940790cc7465d1b03e08d472ffd8684808 (diff) | |
| download | git-159e6010c2d586acea9704993971365a804ea1ce.tar.gz git-159e6010c2d586acea9704993971365a804ea1ce.tar.xz | |
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>
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | ci/test-documentation.sh | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 591cc57b8..c26f3bf78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ matrix: - asciidoc - xmlto before_install: - before_script: + before_script: gem install asciidoctor script: ci/test-documentation.sh after_failure: diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh index 579d540d3..bf23b2cae 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 |