From 984e295500580fc706330bf46fe28b71e89f5d57 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Mon, 28 Jan 2019 20:29:59 +0000
Subject: [PATCH] gitlab-ci: add make Gallium ST Clover LLVM-3.9 build

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
 .gitlab-ci.yml | 24 ++++++++++++++++++++++++
 .travis.yml    | 30 ------------------------------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 511ed47caf6..360eec62ade 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -365,6 +365,30 @@ build:make-gallium-drivers-other:
     LLVM_VERSION: "3.9"
     GALLIUM_DRIVERS: "i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
 
+build:make-gallium-st-clover-llvm-39:
+  extends: .make-build
+  variables:
+    MAKE_CHECK_COMMAND: "true"
+    LLVM_VERSION: "3.9"
+    DRI_LOADERS: >
+      --disable-glx
+      --disable-gbm
+      --disable-egl
+    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"
+    LIBUNWIND_FLAGS: --enable-libunwind
+
 build:scons-nollvm:
   extends: .scons-build
   variables:
diff --git a/.travis.yml b/.travis.yml
index fe82a0931b9..4d6579db550 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,36 +31,6 @@ env:
 
 matrix:
   include:
-    - env:
-        - LABEL="make Gallium ST Clover LLVM-3.9"
-        - 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="--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"
-        - VULKAN_DRIVERS=""
-        - LIBUNWIND_FLAGS="--enable-libunwind"
-      addons:
-        apt:
-          packages:
-            - libclc-dev
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
-            - llvm-3.9-dev
-            - clang-3.9
-            - libclang-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-4.0"
         - BUILD=make
-- 
2.30.2