From 3e631f7037810d8e289e556e7e579fc385ac198f Mon Sep 17 00:00:00 2001
From: Christian Beer <christian.beer@posteo.de>
Date: Tue, 10 Feb 2015 11:35:41 +0100
Subject: [PATCH] BUILD: rearrange build matrix for travis-ci again - this will
 hopefully keep the build matrix for master and allow a separate matrix for
 coverity_scan

---
 .travis.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 882509437ee..44b9aab6b9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: cpp
-#compiler:
-#  - gcc
+compiler:
+  - gcc
 #  - clang
 
 branches:
@@ -20,19 +20,14 @@ env:
     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
     #   via the "travis encrypt" command using the project repo's public key
     - secure: "Rd++Hyurnwd/tvjH0PX2seO3QUZ6WOf8bSB2ZkKPfZCU6+tXVMvloyog6Mlc7vl0m3WFAzw24MDtNLFBUktRsVXOkqDup1s6PdkwwcwG+5wAnydN+kXF9PcqKyOi0xJvl48Wji+r92Y9SCLzPnQGjZg70xHET22bDZHt2FsjP80="
-#- BOINC_TYPE=libs
-#- BOINC_TYPE=server
-#- BOINC_TYPE=client
-#- BOINC_TYPE=manager
+  matrix:
+    - BOINC_TYPE=libs
+    - BOINC_TYPE=server
+    - BOINC_TYPE=client
+    #- BOINC_TYPE=manager
+    #- BOINC_TYPE=coverity
 
 matrix:
-  include:
-    - compiler: "gcc"
-      env: BOINC_TYPE=libs
-    - compiler: "gcc"
-      env: BOINC_TYPE=server
-    - compiler: "gcc"
-      env: BOINC_TYPE=client
   fast_finish: true
 
 before_install:
@@ -43,6 +38,7 @@ install:
 - if [[ "${BOINC_TYPE}" == "server" ]]; then ( sudo apt-get install python libssl-dev python-mysqldb libmysqlclient-dev libfcgi-dev -qq ) fi
 - if [[ "${BOINC_TYPE}" == "client" ]]; then ( sudo apt-get install libssl-dev libcurl4-openssl-dev libxss-dev libnotify-dev libxcb-util0-dev -qq ) fi
 - if [[ "${BOINC_TYPE}" == "manager" ]]; then ( sudo apt-get install libssl-dev libxss-dev libnotify-dev libxcb-util0-dev libsqlite3-dev ) fi
+- if [[ "${BOINC_TYPE}" == "coverity" ]]; then ( sudo apt-get install python libssl-dev python-mysqldb libmysqlclient-dev libfcgi-dev libcurl4-openssl-dev libxss-dev libnotify-dev libxcb-util0-dev -qq ) fi
 
 before_script:
 - ./_autosetup
@@ -59,6 +55,6 @@ addons:
       name: "BOINC/boinc"
       description: "Build submitted via Travis CI"
     notification_email: christian.beer@posteo.de
-    build_command_prepend: "./coverty_prepare.sh"
+    build_command_prepend: "./configure --disable-manager"
     build_command:   "make -j 4"
     branch_pattern: coverity_scan