diff options
| author |  Viet Hoa Dinh <dinh.viet.hoa@gmail.com> | 2018-09-19 07:18:24 -0700 |
|---|---|---|
| committer | Viet Hoa Dinh <dinh.viet.hoa@gmail.com> | 2018-09-19 07:18:44 -0700 |
| commit | c6a21be1688e0ae11fac0602fa5365a443d0c075 (patch) | |
| tree | d07c0274df9fa3d2a1f4cccdd398043e587c06d8 | |
| parent | 096c8665b5d7c6851395a46bd09d33e3fa6e2d52 (diff) | |
Fix travis build
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | scripts/travis/script.sh | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index f2232066..ec0b8636 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,3 @@ os: language: c++ before_script: scripts/travis/before-script.sh script: scripts/travis/script.sh -osx_image: xcode7 diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh index fb66a5a9..674eb522 100755 --- a/scripts/travis/script.sh +++ b/scripts/travis/script.sh @@ -22,22 +22,22 @@ uname if test x"`uname`" = xDarwin ; then echo Building library for iPhoneOS - xctool -project build-mac/mailcore2.xcodeproj -sdk $IPHONESDK -scheme "static mailcore2 ios" build ARCHS="armv7 armv7s arm64" + xcodebuild -project build-mac/mailcore2.xcodeproj -sdk $IPHONESDK -scheme "static mailcore2 ios" build ARCHS="armv7 armv7s arm64" >/dev/null echo Building library for iPhoneSimulator - xctool -project build-mac/mailcore2.xcodeproj -sdk $SIMULATORSDK -scheme "static mailcore2 ios" build ARCHS="i386 x86_64" + xcodebuild -project build-mac/mailcore2.xcodeproj -sdk $SIMULATORSDK -scheme "static mailcore2 ios" build ARCHS="i386 x86_64" >/dev/null #echo Link test for iPhoneOS #xcodebuild -project build-mac/mailcore2.xcodeproj -sdk iphoneos7.1 -target "test-ios" CODE_SIGN_IDENTITY="" build echo Link test for iPhoneSimulator xctool -project build-mac/mailcore2.xcodeproj -sdk $SIMULATORSDK -scheme "test-ios" build ARCHS="i386 x86_64" echo Building library for Mac - xctool -project build-mac/mailcore2.xcodeproj -sdk $MACSDK -scheme "static mailcore2 osx" build + xcodebuild -project build-mac/mailcore2.xcodeproj -sdk $MACSDK -scheme "static mailcore2 osx" build >/dev/null echo Building framework for Mac - xctool -project build-mac/mailcore2.xcodeproj -sdk $MACSDK -scheme "mailcore osx" build + xcodebuild -project build-mac/mailcore2.xcodeproj -sdk $MACSDK -scheme "mailcore osx" build >/dev/null echo Link test for Mac - xctool -project build-mac/mailcore2.xcodeproj -sdk $MACSDK -scheme "tests" build + xcodebuild -project build-mac/mailcore2.xcodeproj -sdk $MACSDK -scheme "tests" build >/dev/null echo Unit Tests for Mac - xctool -project build-mac/mailcore2.xcodeproj -sdk $MACSDK -scheme "unittest" test + xcodebuild -project build-mac/mailcore2.xcodeproj -sdk $MACSDK -scheme "unittest" test >/dev/null fi echo Testing CMake build |