summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-01-30 09:05:51 -0800
committerMike Morris <michael.patrick.morris@gmail.com>2015-01-30 09:05:51 -0800
commitffd7f43bcaf97dfbcb442288e221647f910e31f7 (patch)
tree08b24a267747a83da25fd608671e92005d70aaf5
parentcda961017f03681256d198c8e5193b8100f572ff (diff)
downloadqtlocation-mapboxgl-ffd7f43bcaf97dfbcb442288e221647f910e31f7.tar.gz
test against mesa 10.4.3 on travis
-rw-r--r--.travis.yml2
-rwxr-xr-xscripts/travis_before_install.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index eaa9d2d755..9dccffe9e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ before_install:
- source ./scripts/travis_helper.sh
- source ./scripts/flags.sh
- ./scripts/travis_before_install.sh
-- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi
+- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.4.3`/lib; fi
- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then glxinfo; fi
install:
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 1b0f884bfb..060a142093 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -33,7 +33,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
llvm-3.4 # required for mesa
mapbox_time "install_mesa" \
- mason install mesa 10.3.1
+ mason install mesa 10.4.3
fi
mapbox_time "install_awscli" \