aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorlloyd <[email protected]>2015-05-13 02:00:34 +0000
committerlloyd <[email protected]>2015-05-13 02:00:34 +0000
commita1524df3c1b7bee3bfd7cab3309f763b3e9599a7 (patch)
treef9ff58083863a4564c5c4a326af6f14d494dd2df /.travis.yml
parent96fa3e962d7f2e275f3810439c4ae3c7b58681bb (diff)
Merge env: blocks
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 4bb708a9b..23ac9f667 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,11 @@ env:
- BUILD_MODE="static"
- BUILD_MODE="coverage"
+ global:
+ # Coverity token
+ - secure: "g5vrCKeJwv+Brjlf1yuv/3FsJBVF9jVB+TmIyzXqTVzUk2LLFMNax04LaMTrQKHVrkXX/r/XdiTIl8/9EMqQGDx/kAPZpde5uJqy1aV8fE2IvYRj7sNSRm2smKNaioZnFYH6sm8dthoDARjxBY/nPmop0F6LVqSyRdZZVT9I/QY="
+
+
matrix:
exclude:
- compiler: clang
@@ -33,12 +38,6 @@ after_success:
notifications:
-env:
- global:
- # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
- # via the "travis encrypt" command using the project repo's public key
- - secure: "g5vrCKeJwv+Brjlf1yuv/3FsJBVF9jVB+TmIyzXqTVzUk2LLFMNax04LaMTrQKHVrkXX/r/XdiTIl8/9EMqQGDx/kAPZpde5uJqy1aV8fE2IvYRj7sNSRm2smKNaioZnFYH6sm8dthoDARjxBY/nPmop0F6LVqSyRdZZVT9I/QY="
-
addons:
coverity_scan:
project:
@@ -47,4 +46,4 @@ addons:
notification_email: [email protected]
build_command_prepend: "./configure.py"
build_command: "make -j 4"
- branch_pattern: coverity_scan
+ branch_pattern: master