Skip to content

Commit 159e601

Browse files
larsxschneidergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 49800c9 commit 159e601

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ matrix:
6969
- asciidoc
7070
- xmlto
7171
before_install:
72-
before_script:
72+
before_script: gem install asciidoctor
7373
script: ci/test-documentation.sh
7474
after_failure:
7575

ci/test-documentation.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,16 @@ set -e
77

88
make check-builtins
99
make check-docs
10-
make doc
1110

11+
# Build docs with AsciiDoc
12+
make doc
1213
test -s Documentation/git.html
1314
test -s Documentation/git.xml
1415
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

0 commit comments

Comments
 (0)