summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-05-28 16:50:03 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-05-29 10:18:31 -0700
commitc1d42aa55791ca5dfcef9247cb03d7362a68dd8d (patch)
treedfafc15a0e8678a1c0ae8c3250500be1e6a196a8 /.travis.yml
parent10fdc7be9c293155c9e6206d58859a03d8dc0107 (diff)
downloadqtlocation-mapboxgl-c1d42aa55791ca5dfcef9247cb03d7362a68dd8d.tar.gz
Opt-in to Travis Xcode 6.3 beta
http://blog.travis-ci.com/2015-05-26-xcode-63-beta-general-availability/
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 1ac66b3862..e5b94a813a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,10 @@ matrix:
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: beta-xcode6.3
env: FLAVOR=osx BUILDTYPE=Debug
- os: osx
+ osx_image: beta-xcode6.3
env: FLAVOR=ios BUILDTYPE=Release
- os: linux
env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release