From 8744ac0904a17cebc6dc341f9bccce690267639b Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Mon, 28 Jan 2019 18:07:31 +0000
Subject: [PATCH] gitlab-ci: add meson gallium ST Clover (LLVM 6.0) build

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
 .gitlab-ci.yml               |  5 +++++
 .gitlab-ci/Dockerfile.ubuntu |  2 ++
 .travis.yml                  | 25 -------------------------
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 979cbadc717..c9cbae3fc8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -248,6 +248,11 @@ build:meson-gallium-clover-llvm5:
     GALLIUM_DRIVERS: "r600"
     LLVM_VERSION: "5.0"
 
+build:meson-gallium-clover-llvm6:
+  extends: build:meson-gallium-clover-llvm5
+  variables:
+    LLVM_VERSION: "6.0"
+
 build:make-vulkan:
   extends: .make-build
   variables:
diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu
index 1f334ed9946..86fd89248fa 100644
--- a/.gitlab-ci/Dockerfile.ubuntu
+++ b/.gitlab-ci/Dockerfile.ubuntu
@@ -30,6 +30,8 @@ RUN apt-get install -y \
       llvm-7-dev \
       clang-5.0 \
       libclang-5.0-dev \
+      clang-6.0 \
+      libclang-6.0-dev \
       libclc-dev \
       xz-utils \
       libexpat1-dev \
diff --git a/.travis.yml b/.travis.yml
index 662466ed69d..b6daf1f5966 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,31 +54,6 @@ matrix:
             - libxfixes-dev
             - python3-pip
             - python3-setuptools
-    - env:
-        - LABEL="meson Gallium ST Clover LLVM-6.0"
-        - BUILD=meson
-        - UNWIND="true"
-        - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false"
-        - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=icd"
-        - GALLIUM_DRIVERS="r600"
-        - LLVM_VERSION=6.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          packages:
-            - libclc-dev
-            - llvm-6.0-dev
-            - clang-6.0
-            - libclang-6.0-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3.5
-            - python3-pip
-            - python3-setuptools
     - env:
         - LABEL="meson Gallium ST Clover LLVM-7"
         - BUILD=meson
-- 
2.30.2