From 96e249bcb1cfd2c18a77af3d3d1347ae1fe158ab Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 8 Feb 2019 16:37:09 +0200 Subject: [PATCH] - updated Travis CI configuration Select Release configuration explicitly because CMAKE_BUILD_TYPE doesn't work with MSBuild projects Use long names for command line options of native build tools Enable minimal verbosity for MSBuild --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index acba0ae31..2933bf419 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,11 +108,11 @@ matrix: - os: windows env: - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -A Win32" + - CMAKE_OPTIONS="-A Win32" - os: windows env: - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -A x64" + - CMAKE_OPTIONS="-A x64" before_install: - if [ -n "$GCC_VERSION" ]; then export CC="gcc-${GCC_VERSION}" CXX="g++-${GCC_VERSION}"; fi @@ -132,8 +132,8 @@ script: -DFORCE_INTERNAL_GME=YES \ -DPK3_QUIET_ZIPDIR=YES \ .. - - if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . -- -m; fi - - if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2 -k; fi + - if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . --config Release -- -maxcpucount -verbosity:minimal; fi + - if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- --jobs=2 --keep-going; fi notifications: email: false