diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:33 -0700 |
| commit | a04694138a169333247662c824ac21297e922d15 (patch) | |
| tree | 829b84c7e94083b956681c05df2f9c251bafd09f | |
| parent | Merge branch 'jc/ll-merge-internal' (diff) | |
| parent | travis-ci: build documentation (diff) | |
| download | tgif-a04694138a169333247662c824ac21297e922d15.tar.xz | |
Merge branch 'ls/travis-build-doc'
CI test was taught to build documentation pages.
* ls/travis-build-doc:
travis-ci: build documentation
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rwxr-xr-x | ci/test-documentation.sh | 14 |
2 files changed, 29 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 1fdcec8437..adab5b89bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,21 @@ env: # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X - GIT_SKIP_TESTS="t9810 t9816" +matrix: + include: + - env: Documentation + os: linux + compiler: clang + addons: + apt: + packages: + - asciidoc + - xmlto + before_install: + before_script: + script: ci/test-documentation.sh + after_failure: + before_install: - > case "${TRAVIS_OS_NAME:-linux}" in diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh new file mode 100755 index 0000000000..579d540d32 --- /dev/null +++ b/ci/test-documentation.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# +# Perform sanity checks on documentation and build it. +# + +set -e + +make check-builtins +make check-docs +make doc + +test -s Documentation/git.html +test -s Documentation/git.xml +test -s Documentation/git.1 |