diff options
| author | archshift <gh@archshift.com> | 2015-06-02 05:21:35 +0200 |
|---|---|---|
| committer | archshift <gh@archshift.com> | 2015-06-02 05:21:35 +0200 |
| commit | 9adb2dfb2ed49900c894a445145fe616e3426b6f (patch) | |
| tree | c8518b8d55c49e47a90b40a2af38ed0d9d925840 | |
| parent | Merge pull request #838 from lioncash/thumb (diff) | |
| parent | Use xcpretty for xcodebuild on Travis (diff) | |
| download | yuzu-9adb2dfb2ed49900c894a445145fe616e3426b6f.tar yuzu-9adb2dfb2ed49900c894a445145fe616e3426b6f.tar.gz yuzu-9adb2dfb2ed49900c894a445145fe616e3426b6f.tar.bz2 yuzu-9adb2dfb2ed49900c894a445145fe616e3426b6f.tar.lz yuzu-9adb2dfb2ed49900c894a445145fe616e3426b6f.tar.xz yuzu-9adb2dfb2ed49900c894a445145fe616e3426b6f.tar.zst yuzu-9adb2dfb2ed49900c894a445145fe616e3426b6f.zip | |
| -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 |