diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-04-06 14:41:44 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-04-29 13:35:17 +0100 |
| commit | 85ee2c6cfcd5deeca2ee0cf11079afccd6e7324e (patch) | |
| tree | ad8d266ac388ce0f1c50148e00c2b06831a0a9f2 /.travis.yml | |
| parent | 56ba252e230dfeb93fad26cdbf5f6247524459c7 (diff) | |
travis: add separate "scons" and "scons llvm" targets
The former does not require any LLVM, while the latter uses LLVM 3.3.
This way we'll quickly catch any LLVM 3.3+ functionality that gets
introduced where it shouldn't.
Add the full list of addons for each build permutation.
v2: Keep libedit-dev, rework check target.
v3: Comment the current check target, add -j4 SCONSFLAGS
v4:
- Remove llvm-toolchain-trusty-3.3 source (Andres)
- Keep check target as-is (Andres)
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 | 61 |
1 files changed, 45 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 0d87c663bb2..38f55713511 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,20 +7,6 @@ cache: apt: true ccache: true -addons: - apt: - sources: - - llvm-toolchain-trusty-3.9 - packages: - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - # LLVM packaging is broken and misses these dependencies - - libedit-dev - - llvm-3.9-dev - - libelf-dev - - scons - env: global: - XORG_RELEASES=http://xorg.freedesktop.org/releases/individual @@ -34,8 +20,6 @@ env: - LIBXCB_VERSION=libxcb-1.11 - LIBXSHMFENCE_VERSION=libxshmfence-1.2 - LIBTXC_DXTN_VERSION=libtxc_dxtn-1.0.1 - - LLVM_VERSION=3.9 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH" @@ -45,11 +29,56 @@ matrix: - LABEL="make" - BUILD=make - MAKEFLAGS=-j2 + - LLVM_VERSION=3.9 + - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" + addons: + apt: + sources: + - llvm-toolchain-trusty-3.9 + packages: + # LLVM packaging is broken and misses these dependencies + - libedit-dev + # From sources above + - llvm-3.9-dev + # Common + - x11proto-xf86vidmode-dev + - libexpat1-dev + - libx11-xcb-dev + - libelf-dev + - env: + - LABEL="scons" + - BUILD=scons + - SCONSFLAGS="-j4" + # Explicitly disable. + - SCONS_TARGET="llvm=0" + addons: + apt: + packages: + - scons + # Common + - x11proto-xf86vidmode-dev + - libexpat1-dev + - libx11-xcb-dev + - libelf-dev - env: - LABEL="scons LLVM" - BUILD=scons - SCONSFLAGS="-j4" - SCONS_TARGET="llvm=1" + - LLVM_VERSION=3.3 + - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" + addons: + apt: + packages: + - scons + # LLVM packaging is broken and misses these dependencies + - libedit-dev + - llvm-3.3-dev + # Common + - x11proto-xf86vidmode-dev + - libexpat1-dev + - libx11-xcb-dev + - libelf-dev install: - pip install --user mako |