Module: Mesa Branch: master Commit: d631916f295d8e40e7f9e329bd285a32f2747c3c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d631916f295d8e40e7f9e329bd285a32f2747c3c
Author: Juan A. Suarez Romero <[email protected]> Date: Mon Sep 10 14:15:33 2018 +0200 travis: use python3.5 for meson Newer Meson versions require python >=3.5. But in Trusty default python3 version is 3.4.x. Install python3.5 and makes it the default version for Meson using update-alternatives method. CC: Jan Vesely <[email protected]> CC: Andres Gomez <[email protected]> CC: Emil Velikov <[email protected]> CC: Jon Turney <[email protected]> CC: Eric Engestrom <[email protected]> CC: Dylan Baker <[email protected]> Fixes: 3824c8e7cda97c3bf856 "meson: disable asserts by default on release builds" Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Andres Gomez <[email protected]> --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 079f145a7e..895030cc1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,7 @@ matrix: - xz-utils - libexpat1-dev - libelf-dev + - python3.5 - python3-pip - env: - LABEL="meson loaders/classic DRI" @@ -69,6 +70,7 @@ matrix: - libx11-xcb-dev - libxdamage-dev - libxfixes-dev + - python3.5 - python3-pip - env: - LABEL="make loaders/classic DRI" @@ -490,8 +492,10 @@ before_install: install: # Install a more modern meson from pip, since the version in the - # ubuntu repos is often quite old. + # ubuntu repos is often quite old. This requires python>=3.5, so + # let's make it default - if test "x$BUILD" = xmeson; then + sudo update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.5 10; pip3 install --user meson; pip3 install --user mako; fi _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
