From a06d0d625a74b0547adcf21ca8db129f09277e53 Mon Sep 17 00:00:00 2001 From: Tuomas Virtanen Date: Thu, 3 Nov 2016 00:37:17 +0200 Subject: Re-add specific compiler, use --template for cov in travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 4055ed3..5b9eb7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: - ${TRAVIS_BUILD_DIR}/travis/sdl2.sh - ${TRAVIS_BUILD_DIR}/travis/ffmpeg.sh -script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then cd $TRAVIS_BUILD_DIR && cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=On -DBUILD_TESTS=Off . && make; fi +script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then cd $TRAVIS_BUILD_DIR && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DBUILD_EXAMPLES=On -DBUILD_TESTS=Off . && make; fi notifications: email: false @@ -31,7 +31,7 @@ addons: name: "katajakasa/SDL_kitchensink" description: "A Simple SDL2 / FFmpeg library for audio/video playback written in C99" notification_email: katajakasa@gmail.com - build_command_prepend: "cov-configure --gcc && cmake -DCMAKE_BUILD_TYPE=Debug ." + build_command_prepend: "cov-configure --comptype gcc --compiler /usr/bin/gcc-5 --template && cmake -DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DCMAKE_BUILD_TYPE=Debug ." build_command: "make" branch_pattern: coverity_scan apt: -- cgit v1.2.3