From 324a73f6e1002d0eac45b616277f4f40e03de54d Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Thu, 21 Apr 2016 19:56:07 -0700 Subject: [PATCH] [Build] Some performance optimizations for the build, and now using xcpretty to make raw xcodebuild slightly less horrible / more like xctool. --- .travis.yml | 14 +++++++++----- build.sh | 8 ++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69217e9a71..089f3ab602 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,14 @@ language: objective-c osx_image: xcode7.3 +git: + depth: 10 before_install: - brew update - - brew reinstall --HEAD xctool - - brew reinstall carthage + - brew outdated xctool || brew upgrade xctool + - brew outdated carthage || brew upgrade carthage - gem install cocoapods -v 0.38.2 - - gem install slather + - gem install xcpretty +# - gem install slather - xcrun simctl list install: echo "<3" env: @@ -14,8 +17,9 @@ env: - MODE=life-without-cocoapods - MODE=framework script: ./build.sh $MODE -after_success: - - slather + +#after_success: +# - slather # whitelist branches: diff --git a/build.sh b/build.sh index 39729312f9..daafef03d4 100755 --- a/build.sh +++ b/build.sh @@ -20,12 +20,12 @@ MODE="$1" if [ "$MODE" = "tests" ]; then echo "Building & testing AsyncDisplayKit." pod install - xcodebuild \ + set -o pipefail && xcodebuild \ -workspace AsyncDisplayKit.xcworkspace \ -scheme AsyncDisplayKit \ -sdk "$SDK" \ -destination "$PLATFORM" \ - build test + build test | xcpretty trap - EXIT exit 0 fi @@ -40,12 +40,12 @@ if [ "$MODE" = "examples" ]; then echo "Using CocoaPods" pod install --project-directory=$example - xcodebuild \ + set -o pipefail && xcodebuild \ -workspace "${example}Sample.xcworkspace" \ -scheme Sample \ -sdk "$SDK" \ -destination "$PLATFORM" \ - build + build | xcpretty elif [ -f "${example}/Cartfile" ]; then echo "Using Carthage" local_repo=`pwd`