diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 69 |
1 files changed, 32 insertions, 37 deletions
diff --git a/.travis.yml b/.travis.yml index 0790f271ba..1013fe74f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,33 +2,28 @@ language: android sudo: false -addons: - apt: - sources: - - boost-latest - - ubuntu-toolchain-r-test - packages: - - gdb # for printing stack traces from core dumps - - gcc-4.8 - - g++-4.8 - - llvm-3.4 - - xutils-dev - - libxxf86vm-dev - - x11proto-xf86vidmode-dev - - mesa-utils # for glxinfo - - lib32stdc++6 # for Gradle's aapt - - lib32z1 # for Gradle's aapt - matrix: exclude: - os: linux include: - os: linux env: FLAVOR=linux CXX=g++-4.8 BUILDTYPE=Release + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'gdb', 'g++-4.8', 'gcc-4.8', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] - os: linux env: FLAVOR=linux CXX=clang++ BUILDTYPE=Debug + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'gdb', 'libgcc-4.8-dev', 'libstdc++-4.8-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] - os: linux env: FLAVOR=linux CXX=clang++ BUILDTYPE=Release + addons: + apt: + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'gdb', 'libgcc-4.8-dev', 'libstdc++-4.8-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ] - os: osx env: FLAVOR=osx BUILDTYPE=Debug - os: osx @@ -36,38 +31,38 @@ matrix: - os: linux env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release android: - components: - - build-tools-22.0.0 - - android-22 - - extra + components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + addons: + apt: + packages: [ 'lib32stdc++6' ] - os: linux env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Debug android: - components: - - build-tools-22.0.0 - - android-22 - - extra + components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + addons: + apt: + packages: [ 'lib32stdc++6' ] - os: linux env: FLAVOR=android ANDROID_ABI=arm-v8 BUILDTYPE=Release android: - components: - - build-tools-22.0.0 - - android-22 - - extra + components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + addons: + apt: + packages: [ 'lib32stdc++6' ] - os: linux env: FLAVOR=android ANDROID_ABI=x86 BUILDTYPE=Release android: - components: - - build-tools-22.0.0 - - android-22 - - extra + components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + addons: + apt: + packages: [ 'lib32stdc++6' ] - os: linux env: FLAVOR=android ANDROID_ABI=mips BUILDTYPE=Release android: - components: - - build-tools-22.0.0 - - android-22 - - extra + components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + addons: + apt: + packages: [ 'lib32stdc++6' ] env: global: |