mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Auto merge of #7915 - frewsxcv:travis, r=larsbergstrom
Build Servo on Travis Closes #6962 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7915) <!-- Reviewable:end -->
This commit is contained in:
commit
e5b46eb919
2 changed files with 52 additions and 3 deletions
22
.travis.yml
22
.travis.yml
|
@ -1,9 +1,25 @@
|
||||||
language: python
|
language: python
|
||||||
sudo: false
|
sudo: 9000
|
||||||
|
services:
|
||||||
|
- docker
|
||||||
|
|
||||||
|
before_install:
|
||||||
|
- if [ "$DOCKER" = "1" ]; then docker build -t servo etc/ci/; fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- ./mach test-tidy
|
- if [ "$DOCKER" = "0" ]; then sh -c "$CMD"; fi
|
||||||
|
- if [ "$DOCKER" = "1" ]; then docker run -tv `pwd`:/build servo sh -c "$CMD"; fi
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
fast_finish: true
|
||||||
|
include:
|
||||||
|
- env:
|
||||||
|
- CMD="./mach test-tidy"
|
||||||
|
- DOCKER=0
|
||||||
|
- env:
|
||||||
|
- CMD="./mach build -d --verbose"
|
||||||
|
- DOCKER=1
|
||||||
|
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
|
33
etc/ci/Dockerfile
Normal file
33
etc/ci/Dockerfile
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
FROM ubuntu:vivid
|
||||||
|
|
||||||
|
# Required by mozjs to build
|
||||||
|
ENV SHELL /bin/sh
|
||||||
|
|
||||||
|
# Enable 'universe' since it is not enabled by default
|
||||||
|
RUN echo "deb http://archive.ubuntu.com/ubuntu vivid main universe" > /etc/apt/sources.list
|
||||||
|
RUN echo "deb http://archive.ubuntu.com/ubuntu vivid-updates main universe" >> /etc/apt/sources.list
|
||||||
|
|
||||||
|
# Install dependencies
|
||||||
|
RUN apt-get -y update
|
||||||
|
RUN apt-get install -y \
|
||||||
|
cmake \
|
||||||
|
curl \
|
||||||
|
freeglut3-dev \
|
||||||
|
g++ \
|
||||||
|
git \
|
||||||
|
gperf \
|
||||||
|
libbz2-dev \
|
||||||
|
libfreetype6-dev \
|
||||||
|
libgl1-mesa-dri \
|
||||||
|
libglib2.0-dev \
|
||||||
|
libglu1-mesa-dev \
|
||||||
|
libosmesa6-dev \
|
||||||
|
libssl-dev \
|
||||||
|
libxmu-dev \
|
||||||
|
libxmu6 \
|
||||||
|
python-virtualenv \
|
||||||
|
xorg-dev
|
||||||
|
|
||||||
|
# Servo will be built in /build
|
||||||
|
RUN mkdir /build
|
||||||
|
WORKDIR /build
|
Loading…
Add table
Add a link
Reference in a new issue