diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 18:03:23 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 18:03:23 -0400 |
| commit | ce1e151831ce7de7d3d4c4b19d58667504d716c1 (patch) | |
| tree | 6b36e2e252e91039631cc1b9b8535657167aba68 /.travis.yml | |
| parent | b2032103f2fc8567d623a311ff612853d8bce048 (diff) | |
| parent | ec42892f5c43ec69588c66ea3524bc7f5753619b (diff) | |
| download | qtlocation-mapboxgl-ce1e151831ce7de7d3d4c4b19d58667504d716c1.tar.gz | |
Merge branch 'local-mason'
Conflicts:
.gitmodules
styles
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 8edbe3c157..a7c7109f03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,9 @@ env: - LD_LIBRARY_PATH: '/usr/local/lib' before_install: +- source ./scripts/local_mason.sh - 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 export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi |