diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-01-27 15:26:52 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-01-28 10:34:28 -0800 |
| commit | eaa62291fff35f3b33780a1572ee6e1a265adb4c (patch) | |
| tree | 98edf052cae3c1f88ea142adebcd90ef9ba6e898 /ci/test-documentation.sh | |
| parent | ci/lib.sh: encapsulate Travis-specific things (diff) | |
| download | tgif-eaa62291fff35f3b33780a1572ee6e1a265adb4c.tar.xz | |
ci: inherit --jobs via MAKEFLAGS in run-build-and-tests
Let's not decide in the generic ci/ part how many jobs to run in
parallel; different CI configurations would favor a different number of
parallel jobs, and it is easy enough to hand that information down via
the `MAKEFLAGS` variable.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci/test-documentation.sh')
| -rwxr-xr-x | ci/test-documentation.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh index 7d0beb2832..be3b7d376a 100755 --- a/ci/test-documentation.sh +++ b/ci/test-documentation.sh @@ -12,7 +12,7 @@ make check-builtins make check-docs # Build docs with AsciiDoc -make --jobs=2 doc > >(tee stdout.log) 2> >(tee stderr.log >&2) +make doc > >(tee stdout.log) 2> >(tee stderr.log >&2) ! test -s stderr.log test -s Documentation/git.html test -s Documentation/git.xml @@ -24,7 +24,7 @@ check_unignored_build_artifacts # Build docs with AsciiDoctor make clean -make --jobs=2 USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.log >&2) +make 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 |