From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 May 2017 05:14:44 +0000 (+0900)
Subject: Merge branch 'ls/travis-stricter-linux32-builds'
X-Git-Tag: v2.13.0-rc2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3c0a7b9d6b94ba86db2015445d0963a3fae932dc?ds=inline;hp=-c

Merge branch 'ls/travis-stricter-linux32-builds'

32-bit Linux build on Travis CI uses stricter compilation options.

* ls/travis-stricter-linux32-builds:
travis-ci: set DEVELOPER knob for Linux32 build
---

3c0a7b9d6b94ba86db2015445d0963a3fae932dc
diff --combined .travis.yml
index 297b0bca97,658a219ee1..1b32c98f2c
--- a/.travis.yml
+++ b/.travis.yml
@@@ -61,6 -61,7 +61,7 @@@ matrix
          - >
            docker run
            --interactive
+           --env DEVELOPER
            --env DEFAULT_TEST_TARGET
            --env GIT_PROVE_OPTS
            --env GIT_TEST_OPTS
@@@ -71,18 -72,6 +72,18 @@@
          # Use the following command to debug the docker build locally:
          # $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial
          # root@container:/# /usr/src/git/ci/run-linux32-build.sh
 +    - env: Static Analysis
 +      os: linux
 +      compiler:
 +      addons:
 +        apt:
 +          packages:
 +          - coccinelle
 +      before_install:
 +      script:
 +        # "before_script" that builds Git is inherited from base job
 +        - make coccicheck
 +      after_failure:
      - env: Documentation
        os: linux
        compiler: clang