summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2017-04-11 08:33:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-17 00:28:53 (GMT)
commit912b0ab149ba63f3f0d762b557cc209814874270 (patch)
treeb0be88e94eeaf002424ec841399585fc774fd822
parenta6e69761424f7ad0dd050f6e4575a0679bed7240 (diff)
downloadgit-912b0ab149ba63f3f0d762b557cc209814874270.zip
git-912b0ab149ba63f3f0d762b557cc209814874270.tar.gz
git-912b0ab149ba63f3f0d762b557cc209814874270.tar.bz2
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 <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.travis.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index c26f3bf..e5e7c3e 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: