diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-22 16:48:30 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-22 16:48:30 -0400 |
| commit | 0113ef8dd0cac7e5a661f454a8d4fb1216c96287 (patch) | |
| tree | 8920c9cd87a0864e25a5e95afef28a452a41f232 /.travis.yml | |
| parent | 5c7ce692c727e0047096d0ff10e66e1322925a00 (diff) | |
| parent | 40a933ddce390b7926c25bb00a95f34fd76453ae (diff) | |
| download | qtlocation-mapboxgl-0113ef8dd0cac7e5a661f454a8d4fb1216c96287.tar.gz | |
Merge branch 'headless-display' into mesa
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index fa5bec4686..a1a5f9f7b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,15 +28,13 @@ env: before_install: - source ./scripts/travis_helper.sh - source ./scripts/flags.sh +- (git clone https://github.com/mapbox/mason.git ~/.mason ; sudo ln -s ~/.mason/mason /usr/local/bin/mason) - ./scripts/travis_before_install.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi install: -- make setup -- ./scripts/travis_install.sh - -before_script: -- rm -rf mapnik-packaging/out/packages +- make config.gypi +- ./scripts/travis_install_test_suite.sh script: - ./scripts/travis_script.sh |