From 9a52e3fd4caa6d62634ca9c1f2aa42f7d947bf78 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 12 Jul 2017 12:36:02 +0300 Subject: [PATCH] Travis CI: Remove Coverity Scan for release-7_6 branch (revert commits 18f1ddd, 8fd0719) --- .travis.yml | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index b26d0f0..37ae653 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,18 +7,6 @@ matrix: - os: linux compiler: gcc - os: osx - - os: linux - env: - - COVERITY_SCAN_BRANCH=1 - addons: - coverity_scan: - project: - name: ivmai/libatomic_ops - version: 7.6.0 - notification_email: ivmai@mail.ru - branch_pattern: master - build_command_prepend: CFLAGS=-march=native ./configure - build_command: make -j check CFLAGS_EXTRA=-DLINT2 - os: linux dist: trusty env: @@ -408,17 +396,12 @@ install: - if [[ "$REPORT_COVERAGE" == true ]]; then gem install coveralls-lcov; fi script: -- if [[ "$COVERITY_SCAN_BRANCH" != 1 ]]; then - ./configure $CONF_OPTIONS --enable-werror; - fi -- if [[ "$CSA_CHECK" != true && "$CPPCHECK_ENABLE" == "" - && "$COVERITY_SCAN_BRANCH" != 1 ]]; then +- ./configure $CONF_OPTIONS --enable-werror +- if [[ "$CSA_CHECK" != true && "$CPPCHECK_ENABLE" == "" ]]; then cat src/config.h; fi - if [[ "$CROSS_GCC_VER" != "" ]]; then CC=$CROSS_CC; fi -- if [[ "$COVERITY_SCAN_BRANCH" != 1 ]]; then - make -j $MAKEFILE_TARGET CC=$CC CFLAGS_EXTRA="$CFLAGS_EXTRA"; - fi +- make -j $MAKEFILE_TARGET CC=$CC CFLAGS_EXTRA="$CFLAGS_EXTRA" - if [ -f tests/test_atomic.log ]; then cat tests/test_atomic*.log; fi - if [[ "$CSA_CHECK" == true ]]; then ${CC} --analyze -Xanalyzer -analyzer-output=text -Werror -I src -- 2.50.1