Cc: Dylan Baker <dy...@pnwbakers.com>
Cc: Eric Engestrom <eric.engest...@intel.com>
---
.travis.yml | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 32cd8602e6f..f51ff026e9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,10 +98,8 @@ matrix:
- BUILD=make
- MAKEFLAGS="-j4"
- MAKE_CHECK_COMMAND="true"
- - LLVM_VERSION=5.0
+ - LLVM_VERSION=6.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- - OVERRIDE_CC="gcc-4.8"
- - OVERRIDE_CXX="g++-4.8"
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
- DRI_DRIVERS=""
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa
--disable-nine --disable-xvmc --disable-vdpau --disable-va
--disable-omx-bellagio --disable-gallium-osmesa"
@@ -111,12 +109,12 @@ matrix:
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
- x11proto-xf86vidmode-dev
@@ -436,21 +434,19 @@ matrix:
- BUILD=scons
- SCONSFLAGS="-j4"
- SCONS_TARGET="swr=1"
- - LLVM_VERSION=5.0
+ - LLVM_VERSION=6.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
# Keep it symmetrical to the make build. There's no actual SWR, yet.
- SCONS_CHECK_COMMAND="true"
- - OVERRIDE_CC="gcc-4.8"
- - OVERRIDE_CXX="g++-4.8"
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
- x11proto-xf86vidmode-dev
--
2.17.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
