diff options
| author | Daniel Seither <[email protected]> | 2015-10-13 14:23:34 +0200 |
|---|---|---|
| committer | Daniel Seither <[email protected]> | 2015-10-13 14:23:34 +0200 |
| commit | 2fb36225d40f46f02f0bb0f0e40e665c96b5b5a1 (patch) | |
| tree | 6a9d5ead2b6546feb69c225478fb3d4880335fd6 /.travis.yml | |
| parent | 29b560eba79631436fa475dde1f18ece434befed (diff) | |
Travis CI: Enable 64 bit builds for iOS
* Update Xcode from 6.4 to 7, which also updates the iOS SDK from 8 to 9
* Remove iOS shared library build, which is not very useful
* Add 64 bit iOS static library build
* Refactor build script to use xcrun instead of manually specifying a
sysroot
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 2f268564c..2efbb1f91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ os: - linux - osx -osx_image: xcode6.4 +osx_image: xcode7 compiler: - clang @@ -34,8 +34,8 @@ env: - TARGETOS="desktop" MODULES="min" BUILD_MODE="shared" - TARGETOS="desktop" MODULES="min" BUILD_MODE="static" - - TARGETOS="ios" MODULES="all" BUILD_MODE="shared" - - TARGETOS="ios" MODULES="all" BUILD_MODE="static" + - TARGETOS="ios32" MODULES="all" BUILD_MODE="static" + - TARGETOS="ios64" MODULES="all" BUILD_MODE="static" matrix: exclude: @@ -50,9 +50,9 @@ matrix: - compiler: clang env: TARGETOS="desktop" MODULES="min" BUILD_MODE="static" - os: linux - env: TARGETOS="ios" MODULES="all" BUILD_MODE="shared" + env: TARGETOS="ios32" MODULES="all" BUILD_MODE="static" - os: linux - env: TARGETOS="ios" MODULES="all" BUILD_MODE="static" + env: TARGETOS="ios64" MODULES="all" BUILD_MODE="static" # END BUILD MATRIX cache: |