Hi, changes since v1:
* check Asciidoctor stderr output (Brian) http://public-inbox.org/git/20170418104411.hdkzh3psvej63...@genre.crustytoothpaste.net/ * fix make style nit (Junio) http://public-inbox.org/git/xmqq37dcorr7....@gitster.mtv.corp.google.com/ Thanks, Lars Base Ref: master Web-Diff: https://github.com/larsxschneider/git/commit/315affa7c0 Checkout: git fetch https://github.com/larsxschneider/git travisci/asciidoctor-v2 && git checkout 315affa7c0 Interdiff (v1..v2): diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh index 81f123e68d..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. # @@ -9,7 +9,8 @@ make check-builtins make check-docs # Build docs with AsciiDoc -make --jobs=2 doc +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 @@ -17,6 +18,8 @@ grep '<meta name="generator" content="AsciiDoc ' Documentation/git.html # Build docs with AsciiDoctor make clean -make --jobs=2 doc USE_ASCIIDOCTOR=1 +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 \0 Lars Schneider (4): travis-ci: build documentation with AsciiDoc and Asciidoctor travis-ci: parallelize documentation build travis-ci: check AsciiDoc/AsciiDoctor stderr output travis-ci: unset compiler for jobs that do not need one .travis.yml | 5 +++-- ci/test-documentation.sh | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) base-commit: b14f27f91770e0f99f64135348977a0ce1c7993a -- 2.12.2
