summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2015-07-11 15:14:16 -0700
committerMinh Nguyễn <mxn@1ec5.org>2015-07-11 15:40:39 -0700
commit5f7575dd8feea880fd4ab1c414e281db2ef66cf6 (patch)
tree1c56eb350fa19f0b02e4ec40b336bcbcdc0675bc /.travis.yml
parentf96fef82928698df1d047de1a27cf6d856dee8b8 (diff)
downloadqtlocation-mapboxgl-5f7575dd8feea880fd4ab1c414e281db2ef66cf6.tar.gz
Opt into Xcode 6.4
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index ccd4cd035f..f25079de54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,10 +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.4
+ osx_image: xcode6.4
env: FLAVOR=osx BUILDTYPE=Debug
- os: osx
- osx_image: beta-xcode6.4
+ osx_image: xcode6.4
env: FLAVOR=ios BUILDTYPE=Release
- os: linux
env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release