On 28 April 2017 at 12:38, Andres Gomez <ago...@igalia.com> wrote: > On Thu, 2017-04-27 at 19:38 +0100, Emil Velikov wrote: >> From: Emil Velikov <emil.veli...@collabora.com> >> >> 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 >> >> Signed-off-by: Emil Velikov <emil.veli...@collabora.com> >> --- >> .travis.yml | 66 >> ++++++++++++++++++++++++++++++++++++++++++++++--------------- >> 1 file changed, 50 insertions(+), 16 deletions(-) >> >> diff --git a/.travis.yml b/.travis.yml >> index 31e1aeb7379..f9a994923a7 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,6 +29,39 @@ 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" >> + # Keep it symmetrical to the make build. >> + - SCONS_CHECK_COMMAND="scons llvm=0 check" >> + addons: >> + apt: >> + packages: >> + - scons >> + # Common >> + - x11proto-xf86vidmode-dev >> + - libexpat1-dev >> + - libx11-xcb-dev >> + - libelf-dev >> - env: >> - LABEL="scons LLVM" >> - BUILD=scons >> @@ -52,6 +69,23 @@ matrix: >> - SCONS_TARGET="llvm=1" >> # Keep it symmetrical to the make build. >> - SCONS_CHECK_COMMAND="scons llvm=1 check" >> + - LLVM_VERSION=3.3 >> + - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" >> + addons: >> + apt: >> + sources: >> + - llvm-toolchain-trusty-3.3 > > llvm-toolchain-trusty-3.3 is disallowed (doesn't exist). Additionally, > the LLVM 3.3 packages exist in Trusty, from which they are pulled. > http://packages.ubuntu.com/trusty/llvm-3.3-dev > > With the above 2 lines removed, this is: > Nicely spotted. Thanks
-Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
