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
This commit is contained in:
Christian Beer 2015-02-10 11:35:41 +01:00
parent e95da14958
commit 3e631f7037
1 changed files with 10 additions and 14 deletions

View File

@ -1,6 +1,6 @@
language: cpp language: cpp
#compiler: compiler:
# - gcc - gcc
# - clang # - clang
branches: branches:
@ -20,19 +20,14 @@ env:
# The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
# via the "travis encrypt" command using the project repo's public key # via the "travis encrypt" command using the project repo's public key
- secure: "Rd++Hyurnwd/tvjH0PX2seO3QUZ6WOf8bSB2ZkKPfZCU6+tXVMvloyog6Mlc7vl0m3WFAzw24MDtNLFBUktRsVXOkqDup1s6PdkwwcwG+5wAnydN+kXF9PcqKyOi0xJvl48Wji+r92Y9SCLzPnQGjZg70xHET22bDZHt2FsjP80=" - secure: "Rd++Hyurnwd/tvjH0PX2seO3QUZ6WOf8bSB2ZkKPfZCU6+tXVMvloyog6Mlc7vl0m3WFAzw24MDtNLFBUktRsVXOkqDup1s6PdkwwcwG+5wAnydN+kXF9PcqKyOi0xJvl48Wji+r92Y9SCLzPnQGjZg70xHET22bDZHt2FsjP80="
#- BOINC_TYPE=libs matrix:
#- BOINC_TYPE=server - BOINC_TYPE=libs
#- BOINC_TYPE=client - BOINC_TYPE=server
#- BOINC_TYPE=manager - BOINC_TYPE=client
#- BOINC_TYPE=manager
#- BOINC_TYPE=coverity
matrix: matrix:
include:
- compiler: "gcc"
env: BOINC_TYPE=libs
- compiler: "gcc"
env: BOINC_TYPE=server
- compiler: "gcc"
env: BOINC_TYPE=client
fast_finish: true fast_finish: true
before_install: 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}" == "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}" == "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}" == "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: before_script:
- ./_autosetup - ./_autosetup
@ -59,6 +55,6 @@ addons:
name: "BOINC/boinc" name: "BOINC/boinc"
description: "Build submitted via Travis CI" description: "Build submitted via Travis CI"
notification_email: christian.beer@posteo.de notification_email: christian.beer@posteo.de
build_command_prepend: "./coverty_prepare.sh" build_command_prepend: "./configure --disable-manager"
build_command: "make -j 4" build_command: "make -j 4"
branch_pattern: coverity_scan branch_pattern: coverity_scan