diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 03:03:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 03:03:10 +0300 |
| commit | 916a33875499a230012348ecbb8efcc305142579 (patch) | |
| tree | d2ef8e2711a95bb8a0a5b2d5bc359e09bd9a5c7c /.travis.yml | |
| parent | e215bd91bb3fb3ced90c28b06018ef9d955c5dc2 (diff) | |
| parent | 505ad91304e1793ee588ccdcc2413c2e0af6f667 (diff) | |
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
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 3 insertions, 2 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: |