From 360c814bfe5bec0cc41c86887768a2c876fb5e6a Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Mon, 28 Jan 2019 17:42:59 +0000
Subject: [PATCH] gitlab-ci: add meson gallium SWR build

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f667cfd74c0..6a27ca9f842 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,6 +165,29 @@ build:meson-loader-classic-dri:
       -D gallium-nine=false
       -D gallium-opencl=disabled
 
+# NOTE: Building SWR is 2x (yes two) times slower than all the other
+# gallium drivers combined.
+# Start this early so that it doesn't hunder the run time.
+build:meson-gallium-swr:
+  extends: .meson-build
+  variables:
+    UNWIND: "true"
+    DRI_LOADERS: >
+      -D glx=disabled
+      -D egl=false
+      -D gbm=false
+    GALLIUM_ST: >
+      -D dri3=false
+      -D gallium-vdpau=false
+      -D gallium-xvmc=false
+      -D gallium-omx=disabled
+      -D gallium-va=false
+      -D gallium-xa=false
+      -D gallium-nine=false
+      -D gallium-opencl=disabled
+    GALLIUM_DRIVERS: "swr"
+    LLVM_VERSION: "6.0"
+
 build:make-vulkan:
   extends: .make-build
   variables:
diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu
index 5a27c1502d6..c59a1afadc3 100644
--- a/.gitlab-ci/Dockerfile.ubuntu
+++ b/.gitlab-ci/Dockerfile.ubuntu
@@ -32,6 +32,7 @@ RUN apt-get install -y \
       libx11-xcb-dev \
       x11proto-xf86vidmode-dev \
       libelf-dev \
+      libunwind8-dev \
       python2.7 \
       python-pip \
       python-setuptools \
diff --git a/.travis.yml b/.travis.yml
index 8e2a53a8918..30bc0db9869 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,31 +54,6 @@ matrix:
             - libxfixes-dev
             - python3-pip
             - python3-setuptools
-    - env:
-        # NOTE: Building SWR is 2x (yes two) times slower than all the other
-        # gallium drivers combined.
-        # Start this early so that it doesn't hunder the run time.
-        - LABEL="meson Gallium Drivers SWR"
-        - 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=disabled"
-        - GALLIUM_DRIVERS="swr"
-        - LLVM_VERSION=6.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          packages:
-            - llvm-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 Drivers RadeonSI"
         - BUILD=meson
-- 
2.30.2