diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-05-29 10:17:21 -0700 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-05-29 10:17:21 -0700 |
| commit | e0df8c5a19ed90d1205f4072941df2fcf1526142 (patch) | |
| tree | f0385605864db9163dced64ae7998c1721f1136c /.travis.yml | |
| parent | 545419501415dd312d4f73d859ef899c6a829a4a (diff) | |
| download | qtlocation-mapboxgl-e0df8c5a19ed90d1205f4072941df2fcf1526142.tar.gz | |
build and test on linux and osx in tandem
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 5d46212f11..ed5c26f03d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ language: cpp +# http://docs.travis-ci.com/user/multi-os/ +os: + - linux + - osx + compiler: - gcc - clang @@ -15,28 +20,23 @@ cache: - mapnik-packaging before_install: -- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test -- sudo apt-get update -qq -- sudo apt-get -y install gcc-4.8 g++-4.8 -- sudo apt-get -y install pkg-config nodejs cmake automake libtool xutils-dev -- sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev +- source ./scripts/install_build_deps_${TRAVIS_OS_NAME}.sh +- source ./setup-libraries.sh install: -- ./setup-libraries.sh - rm -rf mapnik-packaging/out/packages - before_script: -- if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi +- if [[ "${TRAVIS_OS_NAME}" == "linux" ]] && [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi script: - make llmr BUILDTYPE=${BUILDTYPE} - make clean -- make linux BUILDTYPE=${BUILDTYPE} +- make ${TRAVIS_OS_NAME} BUILDTYPE=${BUILDTYPE} - make clean - make run-tests BUILDTYPE=${BUILDTYPE} -# TODO - port to linux -#- make run-headless-test BUILDTYPE=${BUILDTYPE} +# TODO - port this test to linux +- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then make run-headless-test BUILDTYPE=${BUILDTYPE} ; fi notifications: - hipchat: WB52YkcbCGMbNcStsGeaoRO7cyBSK4wX2ZHo2Y4b@GL |