diff options
| author | Andres Gomez <agomez@igalia.com> | 2018-02-06 17:42:42 +0200 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2018-02-20 16:58:30 +0200 |
| commit | b39f6d5fc7cec07249cf3fa23ba6163546a9a73b (patch) | |
| tree | d385611afe890c95b7461b1a2be58d7809efa8ab | |
| parent | 1ac741d690bea8e9a3d2dbc2f8e34deadc2ec072 (diff) | |
travis: radeonsi and radv need LLVM 4.0
Fixes: 3bf1e036e8a ("amd: remove support for LLVM 3.9")
Cc: Marek Olšák <marek.olsak@amd.com>
Cc: Emil Velikov <emil.velikov@collabora.com>
Cc: Jan Vesely <jan.vesely@rutgers.edu>
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | .travis.yml | 46 |
1 files changed, 36 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 0156eefb7ad..3651d00169f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,12 +37,12 @@ matrix: addons: apt: sources: - - llvm-toolchain-trusty-3.9 + - llvm-toolchain-trusty-4.0 packages: # LLVM packaging is broken and misses these dependencies - libedit-dev # From sources above - - llvm-3.9-dev + - llvm-4.0-dev # Common - xz-utils - libexpat1-dev @@ -120,6 +120,35 @@ matrix: - libelf-dev - libunwind8-dev - env: + - LABEL="make Gallium Drivers RadeonSI" + - BUILD=make + - MAKEFLAGS="-j4" + - MAKE_CHECK_COMMAND="true" + - LLVM_VERSION=4.0 + - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" + - 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" + - GALLIUM_DRIVERS="radeonsi" + - VULKAN_DRIVERS="" + - LIBUNWIND_FLAGS="--enable-libunwind" + addons: + apt: + sources: + - llvm-toolchain-trusty-4.0 + packages: + # LLVM packaging is broken and misses these dependencies + - libedit-dev + # From sources above + - llvm-4.0-dev + # Common + - xz-utils + - x11proto-xf86vidmode-dev + - libexpat1-dev + - libx11-xcb-dev + - libelf-dev + - libunwind8-dev + - env: - LABEL="make Gallium Drivers Other" - BUILD=make - MAKEFLAGS="-j4" @@ -131,7 +160,7 @@ matrix: - 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" - - GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx" + - GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,freedreno,svga,swrast,vc4,virgl,etnaviv,imx" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: @@ -166,7 +195,7 @@ matrix: - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="r600,radeonsi" + - GALLIUM_DRIVERS="r600" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: @@ -303,10 +332,8 @@ matrix: - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" - - LLVM_VERSION=3.9 + - LLVM_VERSION=4.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - # New binutils linker is required for llvm-3.9 - - OVERRIDE_PATH=/usr/lib/binutils-2.26/bin - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" - DRI_DRIVERS="" - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" @@ -316,13 +343,12 @@ matrix: addons: apt: sources: - - llvm-toolchain-trusty-3.9 + - llvm-toolchain-trusty-4.0 packages: - - binutils-2.26 # LLVM packaging is broken and misses these dependencies - libedit-dev # From sources above - - llvm-3.9-dev + - llvm-4.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev |