diff options
| author | archshift <gh@archshift.com> | 2015-06-01 20:21:35 -0700 |
|---|---|---|
| committer | archshift <gh@archshift.com> | 2015-06-01 20:21:35 -0700 |
| commit | 9adb2dfb2ed49900c894a445145fe616e3426b6f (patch) | |
| tree | c8518b8d55c49e47a90b40a2af38ed0d9d925840 | |
| parent | 1974da272d81f56cdef4ec6b748a7ad702bbeaef (diff) | |
| parent | c2046a109a552d24b3bbdbc6711818267d1facb4 (diff) | |
Merge pull request #844 from chinhodado/xcpretty
Use xcpretty for xcodebuild on Travis
| -rwxr-xr-x | .travis-build.sh | 2 | ||||
| -rwxr-xr-x | .travis-deps.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index 14dfd64d8..422e13220 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -18,5 +18,5 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then export Qt5_DIR=$(brew --prefix)/opt/qt5 mkdir build && cd build cmake .. -GXcode - xcodebuild -configuration Release + xcodebuild -configuration Release | xcpretty -c && exit ${PIPESTATUS[0]} fi diff --git a/.travis-deps.sh b/.travis-deps.sh index f8074fb91..b9561bb66 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -26,4 +26,5 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then elif [ "$TRAVIS_OS_NAME" = "osx" ]; then brew tap homebrew/versions brew install qt5 glfw3 pkgconfig + gem install xcpretty fi |