From 7e522a610c4d8a81ea22c77dfe52bfaaf79ddb8a Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Fri, 9 Sep 2016 10:25:10 +0200 Subject: [PATCH 1/3] disable regular build during coverity run --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index feb0e32..efe0f25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,7 @@ before_script: - cmake .. script: - - make - - ./checkops + - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make && ./checkops ; fi addons: coverity_scan: From 5f65e689014bb6c94977b5cb84ac6ab27a4a65f3 Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Fri, 9 Sep 2016 10:27:44 +0200 Subject: [PATCH 2/3] disable gcc build in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index efe0f25..4dca424 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: cpp sudo: false compiler: - - gcc +# - gcc - clang branches: From 7c49fc560f17a92be372fcf01eece44d99b4e66b Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Fri, 9 Sep 2016 10:40:35 +0200 Subject: [PATCH 3/3] fix coverity build command --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dca424..d6d7c7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: cpp sudo: false compiler: -# - gcc - clang branches: @@ -18,9 +17,6 @@ env: # via the "travis encrypt" command using the project repo's public key - secure: "KuAAwjiIqkk4vqSX/M3ZZIvQs6edm+tV8IADiklTUYZIFyxu8FgZ6RbDdMD2sef5bNZA1OZhlcbeRtiKff5CfMtvzc607Lg3NUkpi+ShMynWgqS/e0uCMf9ogEJlUiZMxf4juBi7v6DyMl/WV6pAdJmdfHtzcj8GF2mgTfQjkO8=" -install: - - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - before_script: - mkdir build - cd build @@ -35,7 +31,7 @@ addons: name: "vgough/encfs" description: "Build submitted via Travis CI" notification_email: vgough@pobox.com - build_command_prepend: "cd build && make clean" + build_command_prepend: "make clean" build_command: "make -j 4" branch_pattern: coverity_scan @@ -43,8 +39,6 @@ addons: sources: - ubuntu-toolchain-r-test packages: - - gcc-4.8 - - g++-4.8 - clang - cmake - libfuse-dev