ci: Use Ninja on AppVeyor

This commit is contained in:
Paweł Bylica 2019-05-15 13:44:03 +02:00
parent f4f2b5db01
commit 3d41dc16d9
No known key found for this signature in database
GPG Key ID: 7A0C037434FE77EF
1 changed files with 12 additions and 15 deletions

View File

@ -1,4 +1,5 @@
version: "{build}" version: "{build}"
image: Visual Studio 2017
branches: branches:
only: only:
- master - master
@ -9,28 +10,23 @@ configuration:
- Release - Release
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - VS: 2015
GENERATOR: "Visual Studio 15 2017 Win64" - VS: 2017
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
GENERATOR: "Visual Studio 14 2015 Win64"
- GO: true - GO: true
cache: cache:
- C:\.hunter\_Base\Cache -> cmake\Hunter\init.cmake - C:\.hunter\_Base\Cache -> cmake\Hunter\init.cmake
before_build: before_build:
- ps: >- # Add ninja to PATH. This is done for VS2017 by vsdevcmd, but not for VS2015.
if ($env:GENERATOR) { - set PATH=%PATH%;%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
if (!(test-path build)) { mkdir build } - if "%VS%" == "2017" (call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\vsdevcmd" -arch=amd64)
cd build - if "%VS%" == "2015" (call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall" x64)
cmake -Wno-dev -G "$env:GENERATOR" .. -DTOOLCHAIN=cxx17-pic -DEVMC_TESTING=ON -DCMAKE_INSTALL_PREFIX=C:\install - if defined VS cmake -S . -B build -G Ninja -Wno-dev -DCMAKE_INSTALL_PREFIX=C:\install -DTOOLCHAIN=cxx17-pic -DEVMC_TESTING=ON
}
build_script: build_script:
- ps: >- - ps: >-
if ($env:GENERATOR) { if ($env:VS) {
cmake --build . --config $env:CONFIGURATION --target install cmake --build build --target install
} }
elseif ($env:GO) { elseif ($env:GO) {
$env:PATH = "C:\msys64\mingw64\bin;$env:PATH" $env:PATH = "C:\msys64\mingw64\bin;$env:PATH"
@ -53,6 +49,7 @@ build_script:
after_build: after_build:
- ps: >- - ps: >-
if ($env:GENERATOR) { if ($env:VS) {
cd build
ctest -C $env:CONFIGURATION -j4 --schedule-random --output-on-failure ctest -C $env:CONFIGURATION -j4 --schedule-random --output-on-failure
} }