Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23182 - jdm:xenial, r=jdm

Browse source 
Switch to Xenial for Linux CI.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23182)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-04-26 12:51:09 -04:00 • committed by GitHub
commit 94c1551c8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -16,12 +16,12 @@ matrix:
- bash etc/ci/check_no_panic.sh - bash etc/ci/check_no_panic.sh
cache: false cache: false
- sudo: 9000 - sudo: 9000
dist: trusty dist: xenial
before_install: before_install:
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo add-apt-repository 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.9 main' -y - sudo add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main' -y
- sudo apt-get update -q - sudo apt-get update -q
- sudo apt-get install clang-3.9 llvm-3.9 llvm-3.9-runtime libunwind8-dev -y - sudo apt-get install clang-3.9 llvm-3.9-dev llvm-3.9-runtime libunwind8-dev -y
- pip install virtualenv - pip install virtualenv
- curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz - curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
- sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc - sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc
@ -30,7 +30,7 @@ matrix:
- export GST_PLUGIN_SCANNER=$PWD/gst/libexec/gstreamer-1.0/gst-plugin-scanner - export GST_PLUGIN_SCANNER=$PWD/gst/libexec/gstreamer-1.0/gst-plugin-scanner
- export PATH=$PATH:$PWD/gst/bin - export PATH=$PATH:$PWD/gst/bin
- export LD_LIBRARY_PATH=$PWD/gst/lib:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH=$PWD/gst/lib:$LD_LIBRARY_PATH
- export LLVM_CONFIG=/usr/lib/llvm-3.9/bin/llvm-config - export LLVM_CONFIG=llvm-config-3.9
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y
- source ~/.profile - source ~/.profile
script: script:
@ -67,6 +67,7 @@ matrix:
- g++-6 - g++-6
- gperf - gperf
- libosmesa6-dev - libosmesa6-dev
- libglu1-mesa-dev
- libgles2-mesa-dev - libgles2-mesa-dev
- python-virtualenv - python-virtualenv
- xorg-dev - xorg-dev