From cd457b72ecfc0804af9c5e4a2b48058cd2fdde12 Mon Sep 17 00:00:00 2001 From: Nicolas Hillegeer Date: Sat, 31 May 2014 16:57:42 +0200 Subject: travis/coverity: hotfix #2, unbreak build I hadn't spotted that the `sh -e` commandline was being used. I *think* this is what's causing the exit 0 line not to run. Pray for success. It's a real shame I can't this locally, what a mess. --- scripts/travis.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts') diff --git a/scripts/travis.sh b/scripts/travis.sh index 50080141ce..83eba872cd 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -78,6 +78,10 @@ fi MAKE_CMD="make -j2" if [ "$TRAVIS_BUILD_TYPE" = "coverity" ]; then + # temporarily disable error checking, the coverity script exits with + # status code 1 whenever it (1) fails OR (2) is not on the correct + # branch. + set +e curl -s https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh | COVERITY_SCAN_PROJECT_NAME="neovim/neovim" \ COVERITY_SCAN_NOTIFICATION_EMAIL="coverity@aktau.be" \ @@ -85,6 +89,7 @@ if [ "$TRAVIS_BUILD_TYPE" = "coverity" ]; then COVERITY_SCAN_BUILD_COMMAND_PREPEND="$MAKE_CMD deps" \ COVERITY_SCAN_BUILD_COMMAND="$MAKE_CMD nvim" \ bash + set -e exit 0 elif [ "$TRAVIS_BUILD_TYPE" = "clang/asan" ]; then if [ ! -d /usr/local/clang-3.4 ]; then -- cgit