From: Andres Gomez <agomez@igalia.com>
Date: Mon, 5 Mar 2018 15:25:36 +0000 (+0200)
Subject: travis: keep meson version below 0.45.0
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72552012c7b461b887c44b3f90e2744bc7512a74;p=mesa.git

travis: keep meson version below 0.45.0

Recently Meson upgraded to 0.45.0 and it needs python 3.5+, which is
not available in Trusty.

Cc: Eric Engestrom <eric.engestrom@imgtec.com>
Cc: Dylan Baker <dylan@pnwbakers.com>
Cc: Emil Velikov <emil.velikov@collabora.com>
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
---

diff --git a/.travis.yml b/.travis.yml
index 823111ca539..dcd150b482b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -460,10 +460,11 @@ before_install:
 install:
   - pip2 install --user mako
 
-  # Install the latest meson from pip, since the version in the ubuntu repos is
-  # often quite old.
+  # Install a more modern meson from pip, since the version in the
+  # ubuntu repos is often quite old. Avoid >=0.45.0 as it needs python
+  # 3.5+
   - if test "x$BUILD" = xmeson; then
-      pip3 install --user meson;
+      pip3 install --user "meson<0.45.0";
     fi
 
   # Since libdrm gets updated in configure.ac regularly, try to pick up the