gitlab-ci: add make Gallium Drivers RadeonSI build

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f414187848a9fedb9c8799cc6ae9bb71b703e4ed..90ff7f8b540ca5a0cf51b6ac3bee00aea1e40841 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -353,6 +353,12 @@ build:make-gallium-drivers-swr:
     GALLIUM_DRIVERS: "swr"
     LIBUNWIND_FLAGS: --enable-libunwind
 
+build:make-gallium-drivers-radeonsi:
+  extends: build:make-gallium-drivers-swr
+  variables:
+    LLVM_VERSION: "7"
+    GALLIUM_DRIVERS: "radeonsi"
+
 build:scons-nollvm:
   extends: .scons-build
   variables:

diff --git a/.travis.yml b/.travis.yml
index 27e681cf5d3514eb4f2107476c44561a3512dfd1..228eb37fb9a04ba09efe3378f44a4bccfd1d7f53 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,35 +31,6 @@ env:
 
 matrix:
   include:
-    - env:
-        - LABEL="make Gallium Drivers RadeonSI"
-        - BUILD=make
-        - MAKEFLAGS="-j4"
-        - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=7
-        - 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:
-            - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
-              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
-          packages:
-            # From sources above
-            - llvm-7-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
     - env:
         - LABEL="make Gallium Drivers Other"
         - BUILD=make