gitlab-ci: add a scons no-llvm build

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08f95c86338c972e54a3ecc2617dc9a1982d1c07..db17a6cccc54c2f63dc11a59da96f59e68020768 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,6 +111,14 @@ containers:ubuntu:
     - make
     - eval $MAKE_CHECK_COMMAND
 
+.scons-build:
+  extends: .build
+  variables:
+    SCONSFLAGS: "-j4"
+  script:
+    - scons $SCONS_TARGET
+    - eval $SCONS_CHECK_COMMAND
+
 build:meson-vulkan:
   extends: .meson-build
   variables:
@@ -157,3 +165,9 @@ build:make-vulkan:
       --disable-gallium-osmesa
     VULKAN_DRIVERS: intel,radeon
     LIBUNWIND_FLAGS: --disable-libunwind
+
+build:scons-nollvm:
+  extends: .scons-build
+  variables:
+    SCONS_TARGET: "llvm=0"
+    SCONS_CHECK_COMMAND: "scons llvm=0 check"

diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu
index bf4c0bc366819f2ed5dc05520eb79fec6595cdaa..7f1d23be4a94e850d0488d8af51f9b4713de70ea 100644 (file)
--- a/.gitlab-ci/Dockerfile.ubuntu
+++ b/.gitlab-ci/Dockerfile.ubuntu
@@ -24,6 +24,7 @@ RUN apt-get install -y \
       xz-utils \
       libexpat1-dev \
       libx11-xcb-dev \
+      x11proto-xf86vidmode-dev \
       libelf-dev \
       python2.7 \
       python-pip \

diff --git a/.travis.yml b/.travis.yml
index de8395c894b58f23ecc13673822b0c7e16ece463..50bb0333001602f9dd8913465a6a3f2c39cb527d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -530,23 +530,6 @@ matrix:
             - libunwind8-dev
             - python3-pip
             - python3-setuptools
-    - env:
-        - LABEL="scons"
-        - BUILD=scons
-        - SCONSFLAGS="-j4"
-        # Explicitly disable.
-        - SCONS_TARGET="llvm=0"
-        # Keep it symmetrical to the make build.
-        - SCONS_CHECK_COMMAND="scons llvm=0 check"
-      addons:
-        apt:
-          packages:
-            # Common
-            - xz-utils
-            - x11proto-xf86vidmode-dev
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
     - env:
         - LABEL="scons LLVM"
         - BUILD=scons