From f2ca48a6f79f41b9d1e29016e2cd6b9c5df39089 Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Thu, 5 Nov 2015 05:46:04 -0300
Subject: travis: Remove coverity_scan addon, call it manually for job 1 only

See https://github.com/travis-ci/travis-ci/issues/1975

Since the addon doesn't handle the job matrix very well, I copied one of
the suggestions from that thread, which does pretty much the same as the
addon but in a place we can control.
---
 .travis.yml | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c867475..af235c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,22 +12,15 @@ compiler:
 env:
   global:
     - secure: "RyCpkq3KU8zftQfD54rNERzzygzLfJtQQXG13LnsIj3NSx5Attr6aM1lZKLWEEgjpkiEuhXkmcwmOuQJfEqYHxYQ24SSKihE9AvEBrOGNuY8CB4SFZEs+atRgovi2SrttdVOU3AzlZSgUUAaHNBUaC7QgimODAyCPV9KfuQkJEw="
+    - COVERITY_SCAN_PROJECT_NAME=jgeboski/bitlbee-facebook
+    - COVERITY_SCAN_NOTIFICATION_EMAIL=nope
+    - COVERITY_SCAN_BUILD_COMMAND=make
+    - COVERITY_SCAN_BRANCH_PATTERN=coverity_scan
 
   matrix:
     - ANALYZER=""
     - ANALYZER="scan-build -k --status-bugs"
 
-addons:
-  coverity_scan:
-    project:
-      name: jgeboski/bitlbee-facebook
-      version: git
-      description: bitlbee-facebook
-
-    build_command_prepend: ./autogen.sh
-    build_command: make
-    branch_pattern: coverity_scan
-
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq
@@ -61,11 +54,9 @@ install:
   - cd -
 
 script:
+  - CFLAGS="-Werror" ./autogen.sh --enable-warnings
   - |
-    if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then
-      CFLAGS="-Werror" ./autogen.sh --enable-warnings
-    fi
-  - |
-    if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then
-      ${ANALYZER} make
+    if [[ "${TRAVIS_JOB_NUMBER##*.}" == "1" ]]; then
+        curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true
     fi
+  - ${ANALYZER} make
-- 
cgit v1.2.3