summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml66
1 files changed, 33 insertions, 33 deletions
diff --git a/.travis.yml b/.travis.yml
index 491d1e8346..71def99a08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,39 @@ matrix:
exclude:
- os: linux
include:
+ - os: osx
+ osx_image: xcode7
+ env: FLAVOR=osx BUILDTYPE=Debug
+ - os: osx
+ osx_image: xcode7
+ compiler: clang
+ env: FLAVOR=node NODE_VERSION=4
+ - os: osx
+ osx_image: xcode7
+ compiler: clang
+ env: FLAVOR=node NODE_VERSION=0.12
+ - os: osx
+ osx_image: xcode7
+ compiler: clang
+ env: FLAVOR=node NODE_VERSION=0.10
+ - os: linux
+ env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=4
+ addons:
+ apt:
+ sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
+ packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
+ - os: linux
+ env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=0.12
+ addons:
+ apt:
+ sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
+ packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
+ - os: linux
+ env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=0.10
+ addons:
+ apt:
+ sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
+ packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- os: linux
env: FLAVOR=linux CXX=g++-4.9 BUILDTYPE=Release
addons:
@@ -24,9 +57,6 @@ matrix:
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- - os: osx
- osx_image: xcode7
- env: FLAVOR=osx BUILDTYPE=Debug
- os: linux
env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release
android:
@@ -55,36 +85,6 @@ matrix:
addons:
apt:
packages: [ 'lib32stdc++6' ]
- - os: linux
- env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=4
- addons:
- apt:
- sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
- packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- - os: linux
- env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=0.12
- addons:
- apt:
- sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
- packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- - os: linux
- env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=0.10
- addons:
- apt:
- sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
- packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- - os: osx
- osx_image: xcode7
- compiler: clang
- env: FLAVOR=node NODE_VERSION=4
- - os: osx
- osx_image: xcode7
- compiler: clang
- env: FLAVOR=node NODE_VERSION=0.12
- - os: osx
- osx_image: xcode7
- compiler: clang
- env: FLAVOR=node NODE_VERSION=0.10
env:
global: