From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 May 2017 02:51:55 +0000 (+0900)
Subject: Merge branch 'ls/travis-doc-asciidoctor'
X-Git-Tag: v2.14.0-rc0~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c773da2e6385be73478c1833d3998afad6c5bfa2;p=thirdparty%2Fgit.git

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
---

c773da2e6385be73478c1833d3998afad6c5bfa2
diff --cc .travis.yml
index 1b32c98f2c,e5e7c3edd7..48cb00a581
--- a/.travis.yml
+++ b/.travis.yml
@@@ -39,19 -39,9 +39,20 @@@ env
  
  matrix:
    include:
 +    - env: Windows
 +      os: linux
 +      compiler:
 +      addons:
 +      before_install:
 +      before_script:
 +      script:
 +        - >
 +          test "$TRAVIS_REPO_SLUG" != "git/git" ||
 +          ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
 +      after_failure:
      - env: Linux32
        os: linux
+       compiler:
        services:
          - docker
        before_install:
@@@ -72,21 -61,9 +73,21 @@@
          # Use the following command to debug the docker build locally:
          # $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial
          # root@container:/# /usr/src/git/ci/run-linux32-build.sh
 +    - env: Static Analysis
 +      os: linux
 +      compiler:
 +      addons:
 +        apt:
 +          packages:
 +          - coccinelle
 +      before_install:
 +      script:
 +        # "before_script" that builds Git is inherited from base job
 +        - make coccicheck
 +      after_failure:
      - env: Documentation
        os: linux
-       compiler: clang
+       compiler:
        addons:
          apt:
            packages: