summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-10-26 00:07:14 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-10-26 00:07:14 +0000
commitc3bbdc3d16b50a88dc03d1dbd04d799ceb2dbea2 (patch)
tree2c8f5a922a819a453c4d822b3538cc9dc7b31df3
parenttravis script: zipping build artifacts on linux only (diff)
downloadDiligentCore-c3bbdc3d16b50a88dc03d1dbd04d799ceb2dbea2.tar.gz
DiligentCore-c3bbdc3d16b50a88dc03d1dbd04d799ceb2dbea2.zip
Updated travis script to build install target and use xcpretty on Mac/iOS build
-rw-r--r--.travis.yml12
1 files changed, 5 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 80411895..3c51694b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -106,13 +106,11 @@ script:
else
cmake .. -DCMAKE_INSTALL_PREFIX=install -G "Xcode"
fi
- xcodebuild -configuration ${CONFIG} | xcpretty
+ cmake --build . --target install --config ${CONFIG} | xcpretty
fi
after_success:
- - |
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
- cd ../cmk_build/install
- export ZIP_NAME=DiligentCore-${TRAVIS_OS_NAME}-${GLSLANG_BUILD_TYPE}.zip;
- zip -r ${ZIP_NAME} .
- fi
+
+ - cd ../cmk_build/install
+ - export ZIP_NAME=DiligentCore-${TRAVIS_OS_NAME}-${GLSLANG_BUILD_TYPE}.zip;
+ - zip -r ${ZIP_NAME} . \ No newline at end of file