Commit 2138f2d7 authored by Emil Velikov's avatar Emil Velikov Committed by Andres Gomez

travis: split out matrix from env

With next commits we'll add a couple of more options.

v2: Rework check target.
v3: Comment the current check target, add -j4 SCONSFLAGS
v4: Keep check target as-is, will rework with later patch.
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: Andres Gomez's avatarAndres Gomez <agomez@igalia.com>
(cherry picked from commit 56ba252e)
parent 8458839b
......@@ -40,10 +40,18 @@ env:
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
- LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH"
- MAKEFLAGS=-j2
matrix:
- BUILD=make
- BUILD=scons
matrix:
include:
- env:
- LABEL="make"
- BUILD=make
- MAKEFLAGS=-j2
- env:
- LABEL="scons LLVM"
- BUILD=scons
- SCONSFLAGS="-j4"
- SCONS_TARGET="llvm=1"
install:
- pip install --user mako
......@@ -127,5 +135,5 @@ script:
fi
- if test "x$BUILD" = xscons; then
scons llvm=1 && scons llvm=1 check;
scons $SCONS_TARGET && scons $SCONS_TARGET check;
fi
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