From a295eea843c47fd04359599448a61e1707aa496c Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 17 Nov 2013 15:43:29 -0800 Subject: [PATCH] improve travis for 2.2.x branch --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31de8c704..3d148f3ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,17 @@ language: cpp -compiler: clang +compiler: + - clang + - gcc before_install: - echo 'yes' | sudo add-apt-repository ppa:mapnik/boost - sudo apt-get update -qq - - sudo apt-get install -qq libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev + - sudo apt-get install -qq make libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev postgresql-server-dev* script: - - ./configure DEMO=False BINDINGS='python' CPP_TESTS=False CAIRO=False INPUT_PLUGINS='' OPTIMIZATION=1 FAST=True && JOBS=2 make - -branches: - only: - - master + - ./configure CXX=${CXX} CC=${CC} DEMO=False BINDINGS='python' CAIRO=False FAST=True && JOBS=2 make + - make test-local notifications: irc: