diff options
| author | Carlos MartÃn Nieto <carlosmn@github.com> | 2016-11-01 09:59:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 09:59:17 +0100 |
| commit | 41ad9ebfad2e8a6c1191580250ce8d63cf5d328a (patch) | |
| tree | 59847d08d070e8d03744628811c57559cbc58927 | |
| parent | a051ee31f2a3790410c2b482611f691135d2eae0 (diff) | |
| parent | 0334bf4b24401c73cb9c9e2211bc4858e61b5934 (diff) | |
| download | libgit2-41ad9ebfad2e8a6c1191580250ce8d63cf5d328a.tar.gz | |
Merge pull request #3975 from pks-t/pks/ci-improvements
CI Improvements
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | script/coverity.sh | 15 |
2 files changed, 7 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index bfc0fac48..af38252ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,9 +47,6 @@ matrix: os: linux allow_failures: - env: COVERITY=1 - - env: - - VALGRIND=1 - OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DDEBUG_POOL=ON -DCMAKE_BUILD_TYPE=Debug" install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./script/install-deps-${TRAVIS_OS_NAME}.sh; fi diff --git a/script/coverity.sh b/script/coverity.sh index 7fe9eb4c7..5fe16c031 100755 --- a/script/coverity.sh +++ b/script/coverity.sh @@ -1,23 +1,22 @@ #!/bin/bash set -e -# Environment check -[ -z "$COVERITY_TOKEN" ] && echo "Need to set a coverity token" && exit 1 - # Only run this on our branches -echo "Pull request: $TRAVIS_PULL_REQUEST | Slug: $TRAVIS_REPO_SLUG" -if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_REPO_SLUG" != "libgit2/libgit2" ]; +echo "Branch: $TRAVIS_BRANCH | Pull request: $TRAVIS_PULL_REQUEST | Slug: $TRAVIS_REPO_SLUG" +if [ "$TRAVIS_BRANCH" != "master" -o "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_REPO_SLUG" != "libgit2/libgit2" ]; then - echo "Only analyzing 'development' on the main repo." + echo "Only analyzing the 'master' brach of the main repository." exit 0 fi -COV_VERSION=6.6.1 +# Environment check +[ -z "$COVERITY_TOKEN" ] && echo "Need to set a coverity token" && exit 1 + case $(uname -m) in i?86) BITS=32 ;; amd64|x86_64) BITS=64 ;; esac -SCAN_TOOL=https://scan.coverity.com/download/linux-${BITS} +SCAN_TOOL=https://scan.coverity.com/download/cxx/linux${BITS} TOOL_BASE=$(pwd)/_coverity-scan # Install coverity tools |