diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2017-02-08 19:01:18 -0800 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2017-02-08 19:01:18 -0800 |
| commit | 1883ab7ee13fb073153088a2bfe8c4c42ebadfba (patch) | |
| tree | b9427ea0674dab68deb6edc787ca527641598506 | |
| parent | cf7b724c923e12b9fccca290c1ff333bb49351f4 (diff) | |
| download | qtlocation-mapboxgl-1883ab7ee13fb073153088a2bfe8c4c42ebadfba.tar.gz | |
adapt to mason changes in master
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 8c6bbe9293..52aceeec8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,11 +100,8 @@ matrix: addons: *clang39 before_install: - git submodule update --init - - (cd .mason && git checkout master && git pull) - - .mason/mason install clang++ 3.9.1 - - export PATH=$(.mason/mason prefix clang++ 3.9.1)/bin:$PATH - - .mason/mason install cmake 3.7.1 - - export PATH=$(.mason/mason prefix cmake 3.7.1)/bin:$PATH + - scripts/mason.sh install clang++ VERSION 3.9.1 + - export PATH=$(scripts/mason.sh PREFIX clang++ VERSION 3.9.1)/bin:$PATH - export CXXFLAGS="-Wno-undefined-var-template -fsanitize=address,undefined" - export LDFLAGS="-fsanitize=address,undefined" before_script: @@ -127,11 +124,8 @@ matrix: env: BUILDTYPE=Debug _CXX=clang++-3.9 _CC=clang-3.9 WITH_EGL=1 addons: *clang39 before_install: - - git submodule update --init - - .mason/mason install clang++ 3.9.1 - - export PATH=$(.mason/mason prefix clang++ 3.9.1)/bin:$PATH - - .mason/mason install cmake 3.7.1 - - export PATH=$(.mason/mason prefix cmake 3.7.1)/bin:$PATH + - scripts/mason.sh install clang++ VERSION 3.9.1 + - export PATH=$(scripts/mason.sh PREFIX clang++ VERSION 3.9.1)/bin:$PATH - export CXXFLAGS="-Wno-undefined-var-template -fsanitize=address,undefined" - export LDFLAGS="-fsanitize=address,undefined" before_script: @@ -140,7 +134,7 @@ matrix: - nvm install 4 - nvm use 4 - make node - - export LD_PRELOAD=$(.mason/mason prefix clang++ 3.9.1)/lib/clang/3.9.1/lib/linux/libclang_rt.asan-x86_64.so + - export LD_PRELOAD=$(scripts/mason.sh PREFIX clang++ VERSION 3.9.1)/lib/clang/3.9.1/lib/linux/libclang_rt.asan-x86_64.so - make test-node after_script: - ccache --show-stats |