From 46952c9e60d7e116a7072a13c6590130eacbd423 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 29 Apr 2016 14:48:55 +0200
Subject: build: travis: Move coverity_scan to existing addons configuration

Move the coverity_scan configuration to the exisint, otherwise the apt
packages won't get installed it seems.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 .travis.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e3e9d9e..3c66eed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,10 @@ compiler:
   - clang
 sudo: false
 
+env:
+  global:
+    - secure: "fTrjH4X1FJaCMAZXVW+sQBuKPr2C+w/pEkIl8FVQZvGxsgpw3OQR28stWnT7VhSuRExUqxEmKcIZgJmU9OAlF/K5ZQkNnUdyQgeiNdhPEMhTCQ3eZv8Ar60UVtmvuzWUN4BP1TUHoBCjq4Wxt1t4QN49P1T7RdjEawCfh+OFZ9s="
+
 addons:
   apt:
     packages:
@@ -16,18 +20,6 @@ addons:
     - libpcap-dev
     - libnet1-dev
     - libcli-dev
-
-script:
-  - CC=$CC ./configure && make CC=$CC
-  - CC=$CC DISABLE_GEOIP=1 ./configure && make clean && make CC=$CC
-  - CC=$CC DISABLE_ZLIB=1 ./configure && make clean && make CC=$CC
-  - CC=$CC DISABLE_GEOIP=1 DISABLE_ZLIB=1 ./configure && make clean && make CC=$CC
-
-env:
-  global:
-    - secure: "fTrjH4X1FJaCMAZXVW+sQBuKPr2C+w/pEkIl8FVQZvGxsgpw3OQR28stWnT7VhSuRExUqxEmKcIZgJmU9OAlF/K5ZQkNnUdyQgeiNdhPEMhTCQ3eZv8Ar60UVtmvuzWUN4BP1TUHoBCjq4Wxt1t4QN49P1T7RdjEawCfh+OFZ9s="
-
-addons:
   coverity_scan:
     project:
       name: "netsniff-ng/netsniff-ng"
@@ -36,3 +28,9 @@ addons:
     build_command_prepend: "./configure && make clean"
     build_command: "make"
     branch_pattern: coverity_scan
+
+script:
+  - CC=$CC ./configure && make CC=$CC
+  - CC=$CC DISABLE_GEOIP=1 ./configure && make clean && make CC=$CC
+  - CC=$CC DISABLE_ZLIB=1 ./configure && make clean && make CC=$CC
+  - CC=$CC DISABLE_GEOIP=1 DISABLE_ZLIB=1 ./configure && make clean && make CC=$CC
-- 
cgit v1.2.3-54-g00ecf