From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Jun 2017 00:03:10 +0000 (+0900)
Subject: Merge branch 'ls/travis-doc-asciidoctor' into maint
X-Git-Tag: v2.13.1~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/916a33875499a230012348ecbb8efcc305142579?hp=-c

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

916a33875499a230012348ecbb8efcc305142579
diff --combined .travis.yml
index 6dd73d1f02,e5e7c3edd7..278943d14a
--- a/.travis.yml
+++ b/.travis.yml
@@@ -39,24 -39,9 +39,25 @@@ env
  
  matrix:
    include:
 +    - env: GETTEXT_POISON=YesPlease
 +      os: linux
 +      compiler:
 +      addons:
 +      before_install:
 +    - 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:
@@@ -66,7 -51,6 +67,7 @@@
          - >
            docker run
            --interactive
 +          --env DEVELOPER
            --env DEFAULT_TEST_TARGET
            --env GIT_PROVE_OPTS
            --env GIT_TEST_OPTS
@@@ -77,28 -61,16 +78,28 @@@
          # 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:
            - asciidoc
            - xmlto
        before_install:
-       before_script:
+       before_script: gem install asciidoctor
        script: ci/test-documentation.sh
        after_failure:
  
@@@ -139,14 -111,12 +140,14 @@@ before_install
      p4 -V | grep Rev.;
      echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)";
      git-lfs version;
 -    mkdir -p $HOME/travis-cache;
 -    ln -s $HOME/travis-cache/.prove t/.prove;
  
  before_script: make --jobs=2
  
 -script: make --quiet test
 +script:
 +  - >
 +    mkdir -p $HOME/travis-cache;
 +    ln -s $HOME/travis-cache/.prove t/.prove;
 +    make --quiet test;
  
  after_failure:
    - >