[Mesa-dev] [PATCH 1/2] travis: replace Trusty-based LLVM toolchain apt-get with apt addon

[Dylan Baker]

Oop, I missed that. Not worth turning it off just to turn it back on.

Quoting Andres Gomez (2017-04-05 11:19:50)
> On Wed, 2017-04-05 at 11:12 -0700, Dylan Baker wrote:
> > I believe you can also remove 'sudo: true' (or set to false) with this change.
> 
> You are probably right but 2/2 makes use of sudo again.
> 
> Don't know whether it is worth disable it in this patch and enable it
> again in 2/2 ...
> 
> > 
> > Dylan
> > 
> > Quoting Andres Gomez (2017-04-05 10:27:30)
> > > Trusty's LLVM toochain repository was whitelisted some time ago. See:
> > > https://github.com/travis-ci/apt-source-whitelist/commit/ebc278924a0b5e282dac685683faf6a318dd424c
> > > 
> > > Signed-off-by: Andres Gomez <agomez at igalia.com>
> > > Cc: Rhys Kidd <rhyskidd at gmail.com>
> > > Cc: Emil Velikov <emil.l.velikov at gmail.com>
> > > ---
> > >  .travis.yml | 15 +++------------
> > >  1 file changed, 3 insertions(+), 12 deletions(-)
> > > 
> > > diff --git a/.travis.yml b/.travis.yml
> > > index 23c4bb53d75..0667c7488d4 100644
> > > --- a/.travis.yml
> > > +++ b/.travis.yml
> > > @@ -9,14 +9,15 @@ cache:
> > >  
> > >  addons:
> > >    apt:
> > > +    sources:
> > > +      - llvm-toolchain-trusty-3.9
> > >      packages:
> > >        - libdrm-dev
> > >        - x11proto-xf86vidmode-dev
> > >        - libexpat1-dev
> > >        - libxcb-dri2-0-dev
> > >        - libx11-xcb-dev
> > > -      # LLVM packaging is broken and misses these dependencies
> > > -      - libedit-dev
> > > +      - llvm-3.9-dev
> > >        - libelf-dev
> > >        - scons
> > >  
> > > @@ -35,7 +36,6 @@ env:
> > >      - 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
> > > @@ -100,15 +100,6 @@ 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
> > > -- 
> > > 2.11.0
> > > 
> > > _______________________________________________
> > > mesa-dev mailing list
> > > mesa-dev at lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> -- 
> Br,
> 
> Andres
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170406/5bef08b2/attachment-0001.sig>