From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Apr 2017 06:39:04 +0000 (+0900)
Subject: Merge branch 'ls/travis-coccicheck'
X-Git-Tag: v2.13.0-rc1~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fa86d5cebe4151b642f66d932b842814e984c70e?ds=inline;hp=-c

Merge branch 'ls/travis-coccicheck'

Travis CI learns to run coccicheck.

* ls/travis-coccicheck:
travis-ci: add static analysis build job to run coccicheck
---

fa86d5cebe4151b642f66d932b842814e984c70e
diff --combined .travis.yml
index c757a111ce,52855c806c..297b0bca97
--- a/.travis.yml
+++ b/.travis.yml
@@@ -39,17 -39,6 +39,17 @@@ env
  
  matrix:
    include:
 +    - env: Windows
 +      os: linux
 +      compiler:
 +      addons:
 +      before_install:
 +      before_script:
 +      script:
 +        - >
 +          test "$TRAVIS_REPO_SLUG" != "git/git" ||
 +          ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
 +      after_failure:
      - env: Linux32
        os: linux
        services:
@@@ -71,6 -60,18 +71,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