From 159e6010c2d586acea9704993971365a804ea1ce Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Tue, 11 Apr 2017 10:33:07 +0200 Subject: travis-ci: build documentation with AsciiDoc and Asciidoctor ec3366e introduced a knob to enable the use of Asciidoctor in addition to AsciiDoc. Build the documentation on TravisCI with this knob to reduce the likeliness of breaking Asciidoctor support in the future. Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 591cc57b80..c26f3bf789 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ matrix: - asciidoc - xmlto before_install: - before_script: + before_script: gem install asciidoctor script: ci/test-documentation.sh after_failure: -- cgit v1.2.3 From 912b0ab149ba63f3f0d762b557cc209814874270 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Tue, 11 Apr 2017 10:33:09 +0200 Subject: travis-ci: unset compiler for jobs that do not need one TravisCI does not need to setup any compiler for the documentation build. Clear the value to fix this. The Linux32 build job does not define the compiler but it inherits the value from the base job. Since it does not need the compiler either because the build runs inside a Docker container we should clear this, too. Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c26f3bf789..e5e7c3edd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,7 @@ matrix: include: - env: Linux32 os: linux + compiler: services: - docker before_install: @@ -62,7 +63,7 @@ matrix: # root@container:/# /usr/src/git/ci/run-linux32-build.sh - env: Documentation os: linux - compiler: clang + compiler: addons: apt: packages: -- cgit v1.2.3