From: Juan A. Suarez Romero <jasuarez@igalia.com>
Date: Mon, 6 Aug 2018 08:19:40 +0000 (+0200)
Subject: travis: meson/Vulkan requires LLVM 6.0
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03cff7ecd8a36b2069a32e660122d091af9ff801;p=mesa.git

travis: meson/Vulkan requires LLVM 6.0

RADV now requires LLVM 6.0.

Fixes: fd1121e8399 ("amd: remove support for LLVM 5.0")
CC: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
---

diff --git a/.travis.yml b/.travis.yml
index 9e45eca8d64..9e07c4b8fe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,17 +36,19 @@ matrix:
         - LABEL="meson Vulkan"
         - BUILD=meson
         - MESON_OPTIONS="-Ddri-drivers=[] -Dgallium-drivers=[]"
-        - LLVM_VERSION=5.0
+        - LLVM_VERSION=6.0
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
+            # llvm-6 depends on gcc-4.9 which is not in main repo
+            - ubuntu-toolchain-r-test
           packages:
             # LLVM packaging is broken and misses these dependencies
             - libedit-dev
             # From sources above
-            - llvm-5.0-dev
+            - llvm-6.0-dev
             # Common
             - xz-utils
             - libexpat1-dev