From 438620e832fcfc506acefd623623277601e88357 Mon Sep 17 00:00:00 2001 From: Bernhard Nortmann Date: Wed, 4 May 2016 10:08:29 +0200 Subject: [PATCH] travis-ci: Extend build matrix, disable email notifications We'll be testing both gcc and clang builds on Linux. As for now, Travis CI only supports clang for OSX - so exclude gcc currently. Signed-off-by: Bernhard Nortmann --- .travis.yml | 14 ++++++++++++++ Makefile | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d276863..84b8b7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,16 @@ language: c os: - linux - osx +compiler: + - gcc + - clang + +# OSX uses Apple's flavor of clang anyway, so there's no point in using "gcc". +# This excludes the "gcc" compiler from the build matrix for OSX: +matrix: + exclude: + - os: osx + compiler: gcc # take care of the libusb dependency for Linux addons: @@ -24,3 +34,7 @@ before_install: script: - make - make misc + +# turn off email notifications +notifications: + - email: false diff --git a/Makefile b/Makefile index d16577b..0df62d6 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -CC = gcc +CC ?= gcc CFLAGS = -g -O0 -Wall -Wextra CFLAGS += -std=c99 $(DEFINES) CFLAGS += -Iinclude/