gitlab-ci: add meson gallium ST Clover (LLVM 6.0) build

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 979cbadc7176950a2f98fa5997feff7ba0507d61..c9cbae3fc8b71ae13436130813bebec715f28728 100644 (file)
--- 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 1f334ed994617f50c08b07a008c1e79fe301b79c..86fd89248fae1096dbc4442359251a96da668983 100644 (file)
--- 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 662466ed69d53afefca366483a674772c816ba0a..b6daf1f5966a6d403ba83dbef3b67c80364138ed 100644 (file)
--- 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