diff options
author | Simon Warta <[email protected]> | 2015-09-02 21:08:09 +0200 |
---|---|---|
committer | Simon Warta <[email protected]> | 2015-09-02 22:16:05 +0200 |
commit | 02c18eb420f695494395dffd5c13ef6f41617fc4 (patch) | |
tree | de332bdd286868638beb69890782c43c640fe5b3 /.travis.yml | |
parent | 67a02c23d4973b870c2ccf9acaa3c83ecff59f88 (diff) |
Update travis configuration for iOS build
Closes #188
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 3044c8dfd..2f268564c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,32 +18,41 @@ os: - linux - osx +osx_image: xcode6.4 + compiler: - clang - gcc env: matrix: - - MODULES="all" BUILD_MODE="shared" - - MODULES="all" BUILD_MODE="static" - - MODULES="all" BUILD_MODE="coverage" - - MODULES="all" BUILD_MODE="sanitizer" + - TARGETOS="desktop" MODULES="all" BUILD_MODE="shared" + - TARGETOS="desktop" MODULES="all" BUILD_MODE="static" + - TARGETOS="desktop" MODULES="all" BUILD_MODE="coverage" + - TARGETOS="desktop" MODULES="all" BUILD_MODE="sanitizer" + + - TARGETOS="desktop" MODULES="min" BUILD_MODE="shared" + - TARGETOS="desktop" MODULES="min" BUILD_MODE="static" - - MODULES="min" BUILD_MODE="shared" - - MODULES="min" BUILD_MODE="static" + - TARGETOS="ios" MODULES="all" BUILD_MODE="shared" + - TARGETOS="ios" MODULES="all" BUILD_MODE="static" matrix: exclude: - os: osx compiler: gcc - compiler: clang - env: MODULES="all" BUILD_MODE="coverage" + env: TARGETOS="desktop" MODULES="all" BUILD_MODE="coverage" - compiler: clang - env: MODULES="all" BUILD_MODE="sanitizer" + env: TARGETOS="desktop" MODULES="all" BUILD_MODE="sanitizer" - compiler: clang - env: MODULES="min" BUILD_MODE="shared" + env: TARGETOS="desktop" MODULES="min" BUILD_MODE="shared" - compiler: clang - env: MODULES="min" BUILD_MODE="static" + env: TARGETOS="desktop" MODULES="min" BUILD_MODE="static" + - os: linux + env: TARGETOS="ios" MODULES="all" BUILD_MODE="shared" + - os: linux + env: TARGETOS="ios" MODULES="all" BUILD_MODE="static" # END BUILD MATRIX cache: @@ -51,13 +60,13 @@ cache: - $HOME/.ccache install: - - ./src/scripts/ci/install.sh + - ./src/scripts/ci/travis/install.sh script: - - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./src/scripts/ci/build.sh ; fi + - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./src/scripts/ci/travis/build.sh ; fi after_success: - - ./src/scripts/ci/after_success.sh + - ./src/scripts/ci/travis/after_success.sh notifications: email: [email protected] @@ -72,6 +81,8 @@ addons: - libssl-dev - libsqlite3-dev - zlib1g-dev + - libbz2-dev + - liblzma-dev coverity_scan: project: |