diff options
| author | Rhys Kidd <rhyskidd@gmail.com> | 2017-04-02 16:48:39 -0400 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-04-03 19:43:12 +0100 |
| commit | 1572d11d897214e5e4421b8b78b5ecb42d31a6d0 (patch) | |
| tree | 6a4a7e56b5478d45fdd29f8776279ad308fcdb79 | |
| parent | a6a38a038bd62e6d9558905f00bef81b5e7e6fcc (diff) | |
travis: Support LLVM 3.8+ on Trusty-based Travis-CI via apt-get not apt addon
Per comments by Travis-CI, the apt addon is only really needed for the
container-based Precise builds, as they don't yet support Trusty on that platform.
Mesa currently uses Trusty fully-virtualized environment (due to sudo: required).
See further:
https://docs.travis-ci.com/user/trusty-ci-environment/#Fully-virtualized-via-sudo%3A-required
https://github.com/travis-ci/apt-source-whitelist/pull/205#issuecomment-216054237
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| -rw-r--r-- | .travis.yml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index a3b094f9a1..aa212b1e24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: c -sudo: true +sudo: required dist: trusty cache: @@ -15,11 +15,9 @@ addons: - libexpat1-dev - libxcb-dri2-0-dev - libx11-xcb-dev - - llvm-3.5-dev - # llvm-config is not in the dev package? - - llvm-3.5 - # LLVM packaging is broken and misses this dep. + # LLVM packaging is broken and misses these dependencies - libedit-dev + - libelf-dev - scons env: @@ -36,6 +34,9 @@ env: - XCBPROTO_VERSION=xcb-proto-1.11 - LIBXCB_VERSION=libxcb-1.11 - LIBXSHMFENCE_VERSION=libxshmfence-1.2 + - LLVM_VERSION=3.9 + - LLVM_PACKAGE="llvm-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev" + - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig - MAKEFLAGS=-j2 matrix: @@ -99,6 +100,15 @@ install: - tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2 - (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix && make install) + # Install LLVM directly via apt-get (not Travis-CI's apt addon) + # See https://github.com/travis-ci/apt-source-whitelist/pull/205#issuecomment-216054237 + + - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - + - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main' + - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty main' + - sudo apt-get update -qq + - sudo apt-get install -qq -y $LLVM_PACKAGE + script: - if test "x$BUILD" = xmake; then ./autogen.sh --enable-debug |