diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-04-06 14:38:40 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-04-29 13:35:17 +0100 |
| commit | 56ba252e230dfeb93fad26cdbf5f6247524459c7 (patch) | |
| tree | 865a3892fbcc6a74f8da1cc324f44892748ecf5a /.travis.yml | |
| parent | abcfea23add91ffa7013a3c862712cfdaefcf8b0 (diff) | |
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: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index a4fe00d802..0d87c663bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,10 +38,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 @@ -117,5 +125,5 @@ script: fi - if test "x$BUILD" = xscons; then - scons llvm=1 && scons llvm=1 check; + scons $SCONS_TARGET && scons $SCONS_TARGET check; fi |