diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-06-03 11:17:40 -0700 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-06-03 11:17:40 -0700 |
| commit | b6ed0b080ab54e34182dc208291d257ad494eb7b (patch) | |
| tree | 58950807d4824d920c51d44d548a6678ea5404fb /.travis.yml | |
| parent | e0dacd465b3d3643d47e4ad06e9898df7210acda (diff) | |
| parent | fbd983f1048a0fb399d0e77b3c165a66268e7cbb (diff) | |
| download | qtlocation-mapboxgl-b6ed0b080ab54e34182dc208291d257ad494eb7b.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into multi-os
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index ed5c26f03d..d149851256 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,26 +20,26 @@ cache: - mapnik-packaging before_install: -- source ./scripts/install_build_deps_${TRAVIS_OS_NAME}.sh -- source ./setup-libraries.sh +- source ./scripts/setup_travis.sh install: -- rm -rf mapnik-packaging/out/packages +- make setup before_script: -- if [[ "${TRAVIS_OS_NAME}" == "linux" ]] && [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi +- rm -rf mapnik-packaging/out/packages script: -- make llmr BUILDTYPE=${BUILDTYPE} -- make clean -- make ${TRAVIS_OS_NAME} BUILDTYPE=${BUILDTYPE} -- make clean +- make linux BUILDTYPE=${BUILDTYPE} - make run-tests 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 + hipchat: + rooms: + secure: "ZKtTiFjXgXfrAO8eMU1nJBe46OBLgk0H7VAVmk84QwAb6DuoqT+mGMs+1yrWtjLwZI8vayZyaucupp1siM7lBWCOADx5GXA6GCCLOuE7fYLSNJFrXHa1u70IUBLOU8b5bDWRn8tcd5CM754R609l4ckTzBH3y4CIh9YNFrB0b+g=" + template: + - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}' git: submodules: false |