diff options
| author | DiligentGraphics <admin@diligentgraphics.com> | 2018-01-27 18:22:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-27 18:22:05 +0000 |
| commit | a0ce098aec2fa79320d09aa7ff86a161f203ee0b (patch) | |
| tree | e6e4d8a992937557955822e735a54589391d2ae9 | |
| parent | Updated travis script (diff) | |
| download | DiligentCore-a0ce098aec2fa79320d09aa7ff86a161f203ee0b.tar.gz DiligentCore-a0ce098aec2fa79320d09aa7ff86a161f203ee0b.zip | |
Updated travis.yml
| -rw-r--r-- | .travis.yml | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 4fa3c48d..0aa9ea29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,11 @@ before_install: - | if [ "$TRAVIS_OS_NAME" = "osx" ]; then if brew ls --versions cmake > /dev/null; then - echo cmake already installed.; + echo cmake already installed. else - brew install cmake; + brew install cmake fi; - brew cmake --version; + cmake --version fi - | if [ "$TRAVIS_OS_NAME" = "linux" ]; then @@ -31,18 +31,6 @@ before_install: cmake --version fi -compiler: - - clang - - gcc - -os: - - osx - - linux - -env: - - CONFIG=Debug - - CONFIG=Release - addons: apt: sources: @@ -51,6 +39,7 @@ addons: - gcc-7 - g++-7 - cmake + matrix: include: - os: linux @@ -78,6 +67,6 @@ script: fi - | if [ "$TRAVIS_OS_NAME" = "osx" ]; then - brew cmake .. -G "Xcode"; - brew cmake --build . --config ${CONFIG}; + cmake .. -G "Xcode" + cmake --build . --config ${CONFIG} fi |