Commit 574ea9fe authored by Daniel Agar's avatar Daniel Agar

travis-ci switch linux to container infrastructure

-enable ccache
parent 17cfe536
...@@ -13,10 +13,10 @@ matrix: ...@@ -13,10 +13,10 @@ matrix:
include: include:
- os: linux - os: linux
env: SPEC=linux-g++-64 CONFIG=debug env: SPEC=linux-g++-64 CONFIG=debug
sudo: true sudo: false
- os: linux - os: linux
env: SPEC=linux-g++-64 CONFIG=installer env: SPEC=linux-g++-64 CONFIG=installer
sudo: true sudo: false
- os: osx - os: osx
osx_image: xcode7 osx_image: xcode7
env: SPEC=macx-clang CONFIG=debug env: SPEC=macx-clang CONFIG=debug
...@@ -38,8 +38,24 @@ android: ...@@ -38,8 +38,24 @@ android:
- build-tools-21.1.1 - build-tools-21.1.1
- android-21 - android-21
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- ccache
- espeak
- g++-4.8
- gcc-4.8
- libc6-i386
- libespeak-dev
- libopenscenegraph-dev
- libsdl1.2-dev
- libudev-dev
cache: cache:
- apt - apt
- ccache
before_install: before_install:
- cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --tags - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --tags
...@@ -49,10 +65,7 @@ before_install: ...@@ -49,10 +65,7 @@ before_install:
install: install:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux.tar.bz2
&& sudo apt-get -qq update
&& sudo apt-get -qq install g++-4.8 espeak libespeak-dev libopenscenegraph-dev libsdl1.2-dev libudev-dev
&& wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux.tar.bz2
&& tar jxf Qt5.5.1-linux.tar.bz2 -C /tmp && tar jxf Qt5.5.1-linux.tar.bz2 -C /tmp
&& export PATH=/tmp/Qt/5.5/gcc_64/bin:$PATH && export PATH=/tmp/Qt/5.5/gcc_64/bin:$PATH
&& export CXX="g++-4.8" && export CXX="g++-4.8"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment