diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2015-07-08 22:30:52 -0700 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2015-07-09 13:57:52 -0700 |
| commit | 7aa83b3c9635b3c952b4d8e3d77dfc48d157f847 (patch) | |
| tree | 6b27ed1da7c43d23029e51606a1169c2b0fefd14 | |
| parent | 2df80af3d3616c0e174ae1b2e24b5010960bd845 (diff) | |
test on Xcode 6.4 / iOS 8.4
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | scripts/ios/test.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index e5b94a813..ccd4cd035 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.3 + osx_image: beta-xcode6.4 env: FLAVOR=osx BUILDTYPE=Debug - os: osx - osx_image: beta-xcode6.3 + osx_image: beta-xcode6.4 env: FLAVOR=ios BUILDTYPE=Release - os: linux env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release diff --git a/scripts/ios/test.sh b/scripts/ios/test.sh index bfaed4646..170aa0f64 100755 --- a/scripts/ios/test.sh +++ b/scripts/ios/test.sh @@ -7,5 +7,5 @@ set -u xctool \ -project ./test/ios/ios-tests.xcodeproj \ -scheme 'Mapbox GL Tests' \ - -sdk iphonesimulator8.3 \ + -sdk iphonesimulator8.4 \ test |