diff options
Diffstat (limited to 'scripts/travis_setup.sh')
| -rwxr-xr-x | scripts/travis_setup.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh index cdf36be363..20688ab4ec 100755 --- a/scripts/travis_setup.sh +++ b/scripts/travis_setup.sh @@ -29,12 +29,6 @@ if [ -x $(which ${CXX}) ]; then ${CXX} --version fi -# Ensure mason is on the PATH -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" - -mapbox_time "checkout_mason" \ -git submodule update --init .mason - # Touch package.json so that we are definitely going to run an npm update action mapbox_time "touch_package_json" \ touch package.json @@ -58,9 +52,11 @@ export -f mapbox_start_xvfb function mapbox_export_mesa_library_path { # Install and set up to load a more recent version of mesa mapbox_time "install_mesa" \ - mason install mesa 13.0.3 - export LD_LIBRARY_PATH="`mason prefix mesa 13.0.3`/lib:${LD_LIBRARY_PATH:-}" - export LIBGL_DRIVERS_PATH="`mason prefix mesa 13.0.3`/lib/dri" + scripts/mason.sh install mesa VERSION 13.0.4 + + MESA_PREFIX=`scripts/mason.sh PREFIX mesa VERSION 13.0.4` + export LD_LIBRARY_PATH="${MESA_PREFIX}/lib:${LD_LIBRARY_PATH:-}" + export LIBGL_DRIVERS_PATH="${MESA_PREFIX}/lib/dri" } export -f mapbox_export_mesa_library_path |