Commit 6a19ec9d authored by Eric Engestrom's avatar Eric Engestrom 💤
Browse files

gitlab-ci: add scons SWR build


Signed-off-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
parent d4c6d4d5
...@@ -181,3 +181,10 @@ build:scons-llvm: ...@@ -181,3 +181,10 @@ build:scons-llvm:
SCONS_TARGET: "llvm=1" SCONS_TARGET: "llvm=1"
SCONS_CHECK_COMMAND: "scons llvm=1 check" SCONS_CHECK_COMMAND: "scons llvm=1 check"
LLVM_VERSION: "3.9" LLVM_VERSION: "3.9"
build:scons-swr:
extends: .scons-build
variables:
SCONS_TARGET: "swr=1"
SCONS_CHECK_COMMAND: "true"
LLVM_VERSION: "6.0"
...@@ -22,6 +22,7 @@ RUN apt-get install -y \ ...@@ -22,6 +22,7 @@ RUN apt-get install -y \
libva-dev \ libva-dev \
llvm-3.9-dev \ llvm-3.9-dev \
libclang-3.9-dev \ libclang-3.9-dev \
llvm-6.0-dev \
llvm-7-dev \ llvm-7-dev \
xz-utils \ xz-utils \
libexpat1-dev \ libexpat1-dev \
......
...@@ -530,25 +530,6 @@ matrix: ...@@ -530,25 +530,6 @@ matrix:
- libunwind8-dev - libunwind8-dev
- python3-pip - python3-pip
- python3-setuptools - python3-setuptools
- env:
- LABEL="scons SWR"
- BUILD=scons
- SCONSFLAGS="-j4"
- SCONS_TARGET="swr=1"
- LLVM_VERSION=6.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
# Keep it symmetrical to the make build. There's no actual SWR, yet.
- SCONS_CHECK_COMMAND="true"
addons:
apt:
packages:
- llvm-6.0-dev
# Common
- xz-utils
- x11proto-xf86vidmode-dev
- libexpat1-dev
- libx11-xcb-dev
- libelf-dev
- env: - env:
- LABEL="macOS make" - LABEL="macOS make"
- BUILD=make - BUILD=make
......
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