diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2017-02-26 17:00:07 +0100 |
|---|---|---|
| committer | Pali Rohár <pali.rohar@gmail.com> | 2017-02-26 17:00:07 +0100 |
| commit | ffcc10f6895151176c29ffd2301c5b124b5a5440 (patch) | |
| tree | 2d56f8f710c3a793c541aa765d5899a0e5218d23 | |
| parent | 16cdf3e77673005bb73cca318292984309f6ac26 (diff) | |
| download | 0xFFFF-ffcc10f6895151176c29ffd2301c5b124b5a5440.tar.bz2 | |
travis: Simplify configuration, move coverity_scan to matrix
| -rw-r--r-- | .travis.yml | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index 698153b..5139ef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,31 @@ sudo: false + language: c + compiler: - gcc - clang -matrix: - include: - - compiler: gcc - env: COVERITY=1 -before_install: - - if [ "$COVERITY" = "1" -a "$TRAVIS_BRANCH" != "master" ]; then exit 0; fi - - if [ "$COVERITY" != "1" ]; then make; exit $?; fi -script: true - -env: - global: - - secure: "JdUp+xFykPZoYA4aRfmYk2CtilLapniQllWPKo2dDdJd1vzdawfTvVxIAKjy7ac9RKwZzg3Chq3RsMEXPv8BtaLbssw266C7RDLMgjacl1eFLcmGRj/Gkk9peDSZ6vVdGEcA2j+6KDSfpCa/XjFjvOufZOgKw6m+3+d0A4G45SI=" -addons: +addons: &addons apt: packages: - libusb-dev - coverity_scan: - project: - name: "pali/0xFFFF" - description: "Build submitted via Travis CI" - notification_email: pali.rohar@gmail.com - build_command: make - branch_pattern: master + +matrix: + include: + - compiler: gcc + env: + - secure: "JdUp+xFykPZoYA4aRfmYk2CtilLapniQllWPKo2dDdJd1vzdawfTvVxIAKjy7ac9RKwZzg3Chq3RsMEXPv8BtaLbssw266C7RDLMgjacl1eFLcmGRj/Gkk9peDSZ6vVdGEcA2j+6KDSfpCa/XjFjvOufZOgKw6m+3+d0A4G45SI=" + addons: + <<: *addons + coverity_scan: + project: + name: "pali/0xFFFF" + description: "Build submitted via Travis CI" + notification_email: pali.rohar@gmail.com + build_command: make + branch_pattern: master + +script: + - if [ "$COVERITY_SCAN_BRANCH" = "1" ]; then exit 0; fi + - make |