update ci

This commit is contained in:
Neargye 2018-08-13 16:29:26 +05:00
parent d297993f52
commit 80e2b5bbcb
2 changed files with 8 additions and 9 deletions

View file

@ -1,5 +1,7 @@
version: "{branch} #{build}" version: "{branch} #{build}"
shallow_clone: true
image: image:
- Visual Studio 2017 - Visual Studio 2017
@ -11,10 +13,8 @@ configuration:
- Debug - Debug
- Release - Release
shallow_clone: true build:
parallel: true
matrix:
fast_finish: false
environment: environment:
matrix: matrix:
@ -25,10 +25,10 @@ before_build:
- if exist build RMDIR /S /Q build - if exist build RMDIR /S /Q build
- if not exist build mkdir build - if not exist build mkdir build
- cd build - cd build
- cmake .. -G "%GENERATOR%" -A %PLATFORM% -DCMAKE_BUILD_TYPE=${CONFIGURATION} - cmake -G "%GENERATOR%" -A %PLATFORM% -DCMAKE_BUILD_TYPE=${CONFIGURATION} ..
build_script: build_script:
- cmake --build . --config %CONFIGURATION% - cmake --build . --config %CONFIGURATION%
test_script: test_script:
- ctest -V --output-on-failure -C %CONFIGURATION% - ctest --output-on-failure -C %CONFIGURATION%

View file

@ -9,7 +9,6 @@ git:
depth: 1 depth: 1
matrix: matrix:
fast_finish: false
include: include:
- os: linux - os: linux
compiler: g++ compiler: g++
@ -275,11 +274,11 @@ before_script:
- rm -rf build - rm -rf build
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake .. -DCMAKE_BUILD_TYPE=${CONFIGURATION} - cmake -DCMAKE_BUILD_TYPE=${CONFIGURATION} ..
script: script:
- cmake --build . --config ${CONFIGURATION} -- -j${JOBS} - cmake --build . --config ${CONFIGURATION} -- -j${JOBS}
- ctest -V --output-on-failure -С ${CONFIGURATION} -j${JOBS} - ctest --output-on-failure -С ${CONFIGURATION} -j${JOBS}
notifications: notifications:
email: false email: false