[Build] Improve formatting of build script output for Travis.

mme · Apr 23, 2016 · 613832f · 613832f
1 parent bbdbb3d
commit 613832f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ before_install:
   - brew outdated carthage || brew upgrade carthage
   - gem install cocoapods -v 0.38.2
   - gem install xcpretty
+  - gem install xcpretty-travis-formatter
 #  - gem install slather
   - xcrun simctl list
 install: echo "<3"

diff --git a/build.sh b/build.sh
@@ -25,7 +25,7 @@ if [ "$MODE" = "tests" ]; then
         -scheme AsyncDisplayKit \
         -sdk "$SDK" \
         -destination "$PLATFORM" \
-        build test | xcpretty
+        build test | xcpretty -f `xcpretty-travis-formatter`
     trap - EXIT
     exit 0
 fi
@@ -45,7 +45,7 @@ if [ "$MODE" = "examples" ]; then
               -scheme Sample \
               -sdk "$SDK" \
               -destination "$PLATFORM" \
-              build | xcpretty
+              build | xcpretty -f `xcpretty-travis-formatter`
         elif [ -f "${example}/Cartfile" ]; then
           echo "Using Carthage"
           local_repo=`pwd`
@@ -55,12 +55,12 @@ if [ "$MODE" = "examples" ]; then
           echo "git \"file://${local_repo}\" \"${current_branch}\"" > "Cartfile"
           carthage update --platform iOS
 
-          xcodebuild \
+          set -o pipefail && xcodebuild \
               -project "Sample.xcodeproj" \
               -scheme Sample \
               -sdk "$SDK" \
               -destination "$PLATFORM" \
-              build
+              build | xcpretty -f `xcpretty-travis-formatter`
 
           cd ../..
         fi
@@ -72,25 +72,25 @@ fi
 if [ "$MODE" = "life-without-cocoapods" ]; then
     echo "Verifying that AsyncDisplayKit functions as a static library."
 
-    xcodebuild \
+    set -o pipefail && xcodebuild \
         -workspace "smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcworkspace" \
         -scheme "Life Without CocoaPods" \
         -sdk "$SDK" \
         -destination "$PLATFORM" \
-        build
+        build | xcpretty -f `xcpretty-travis-formatter`
     trap - EXIT
     exit 0
 fi
 
 if [ "$MODE" = "framework" ]; then
     echo "Verifying that AsyncDisplayKit functions as a dynamic framework (for Swift/Carthage users)."
 
-    xcodebuild \
+    set -o pipefail && xcodebuild \
         -project "smoke-tests/Framework/Sample.xcodeproj" \
         -scheme Sample \
         -sdk "$SDK" \
         -destination "$PLATFORM" \
-        build
+        build | xcpretty -f `xcpretty-travis-formatter`
     trap - EXIT
     exit 0
 fi