diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:10 +0900 |
| commit | 916a33875499a230012348ecbb8efcc305142579 (patch) | |
| tree | d2ef8e2711a95bb8a0a5b2d5bc359e09bd9a5c7c | |
| parent | e215bd91bb3fb3ced90c28b06018ef9d955c5dc2 (diff) | |
| parent | 505ad91304e1793ee588ccdcc2413c2e0af6f667 (diff) | |
| download | git-916a33875499a230012348ecbb8efcc305142579.tar.gz | |
Merge branch 'ls/travis-doc-asciidoctor' into maint
Travis CI gained a task to format the documentation with both
AsciiDoc and AsciiDoctor.
* ls/travis-doc-asciidoctor:
travis-ci: check AsciiDoc/AsciiDoctor stderr output
travis-ci: unset compiler for jobs that do not need one
travis-ci: parallelize documentation build
travis-ci: build documentation with AsciiDoc and Asciidoctor
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | ci/test-documentation.sh | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 6dd73d1f02..278943d14a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,6 +57,7 @@ matrix: after_failure: - env: Linux32 os: linux + compiler: services: - docker before_install: @@ -91,14 +92,14 @@ matrix: after_failure: - env: Documentation os: linux - compiler: clang + compiler: addons: apt: packages: - 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 579d540d32..6214e6acb4 100755 --- a/ci/test-documentation.sh +++ b/ci/test-documentation.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # # Perform sanity checks on documentation and build it. # @@ -7,8 +7,19 @@ set -e make check-builtins make check-docs -make doc +# Build docs with AsciiDoc +make --jobs=2 doc > >(tee stdout.log) 2> >(tee stderr.log >&2) +! test -s stderr.log 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 --jobs=2 USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.log >&2) +sed '/^GIT_VERSION = / d' stderr.log +! test -s stderr.log +test -s Documentation/git.html +grep '<meta name="generator" content="Asciidoctor ' Documentation/git.html |