Commit 06b245b4 authored by Eric Engestrom's avatar Eric Engestrom 💤
Browse files

gitlab-ci: add a scons no-llvm build


Signed-off-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
parent 89a74678
......@@ -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"
......@@ -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 \
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment