diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-16 05:51:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-16 05:51:55 +0300 |
| commit | c773da2e6385be73478c1833d3998afad6c5bfa2 (patch) | |
| tree | 4ed82d8cacf2285c8fedbb06821c904abcfb6c06 /.travis.yml | |
| parent | f0858342fe98eb16c598e8b7eadd0fad123a4cd9 (diff) | |
| parent | 505ad91304e1793ee588ccdcc2413c2e0af6f667 (diff) | |
Merge branch 'ls/travis-doc-asciidoctor'
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 1b32c98f2c..48cb00a581 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,7 @@ matrix: after_failure: - env: Linux32 os: linux + compiler: services: - docker before_install: @@ -86,14 +87,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: |