diff options
| author | Juan A. Suarez Romero <[email protected]> | 2018-09-10 14:15:33 +0200 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2018-09-11 14:27:58 +0100 |
| commit | d631916f295d8e40e7f9e329bd285a32f2747c3c (patch) | |
| tree | 2b726e0b754192b9d35b9db52164451a6537a314 | |
| parent | 3d08631fe5779cfadfeba3df89fbbddf3fde331b (diff) | |
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]>
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 079f145a7e4..895030cc1bc 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 |