diff options
| author | 2015-06-01 21:27:22 -0400 | |
|---|---|---|
| committer | 2015-06-01 22:20:51 -0400 | |
| commit | c2046a109a552d24b3bbdbc6711818267d1facb4 (patch) | |
| tree | 093974565a963d8cc725fa2d4da42f7e5360e6de | |
| parent | Merge pull request #810 from yuriks/memmap (diff) | |
| download | yuzu-c2046a109a552d24b3bbdbc6711818267d1facb4.tar.gz yuzu-c2046a109a552d24b3bbdbc6711818267d1facb4.tar.xz yuzu-c2046a109a552d24b3bbdbc6711818267d1facb4.zip | |
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 | |||
| 18 | export Qt5_DIR=$(brew --prefix)/opt/qt5 | 18 | export Qt5_DIR=$(brew --prefix)/opt/qt5 |
| 19 | mkdir build && cd build | 19 | mkdir build && cd build |
| 20 | cmake .. -GXcode | 20 | cmake .. -GXcode |
| 21 | xcodebuild -configuration Release | 21 | xcodebuild -configuration Release | xcpretty -c && exit ${PIPESTATUS[0]} |
| 22 | fi | 22 | 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 | |||
| 26 | elif [ "$TRAVIS_OS_NAME" = "osx" ]; then | 26 | elif [ "$TRAVIS_OS_NAME" = "osx" ]; then |
| 27 | brew tap homebrew/versions | 27 | brew tap homebrew/versions |
| 28 | brew install qt5 glfw3 pkgconfig | 28 | brew install qt5 glfw3 pkgconfig |
| 29 | gem install xcpretty | ||
| 29 | fi | 30 | fi |