diff options
| author |  Lars Schneider <larsxschneider@gmail.com> | 2017-04-11 10:33:09 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-04-16 17:28:53 -0700 |
| commit | 912b0ab149ba63f3f0d762b557cc209814874270 (patch) | |
| tree | b0be88e94eeaf002424ec841399585fc774fd822 /.travis.yml | |
| parent | travis-ci: parallelize documentation build (diff) | |
| download | tgif-912b0ab149ba63f3f0d762b557cc209814874270.tar.xz | |
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>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
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: |