gitlab-ci: add make Gallium Drivers "Other" build

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90ff7f8b540ca5a0cf51b6ac3bee00aea1e40841..511ed47caf65392b24468bcff907a0b82bfd8f41 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -359,6 +359,12 @@ build:make-gallium-drivers-radeonsi:
     LLVM_VERSION: "7"
     GALLIUM_DRIVERS: "radeonsi"
 
+build:make-gallium-drivers-other:
+  extends: build:make-gallium-drivers-swr
+  variables:
+    LLVM_VERSION: "3.9"
+    GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
+
 build:scons-nollvm:
   extends: .scons-build
   variables:

diff --git a/.travis.yml b/.travis.yml
index 228eb37fb9a04ba09efe3378f44a4bccfd1d7f53..fe82a0931b97b6e79188fc63e70ad32911c6b067 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,33 +31,6 @@ env:
 
 matrix:
   include:
-    - env:
-        - LABEL="make Gallium Drivers Other"
-        - BUILD=make
-        - MAKEFLAGS="-j4"
-        - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=3.9
-        - 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="i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
-        - VULKAN_DRIVERS=""
-        - LIBUNWIND_FLAGS="--enable-libunwind"
-      addons:
-        apt:
-          packages:
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
-            - llvm-3.9-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
     - env:
         - LABEL="make Gallium ST Clover LLVM-3.9"
         - BUILD=make