X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=appveyor.yml;h=8e88b5e7b116694c7b54ab08f610e220a56fc368;hp=443508b7f8da795464981834236c05f2993b7dd9;hb=0197c4f875d3332dbc4656a6360e3c7e9def2ed5;hpb=03be7587ebb45e4e9fb49b47ef25adef6fb88e20 diff --git a/appveyor.yml b/appveyor.yml index 443508b7f8d..8e88b5e7b11 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,9 @@ environment: matrix: - - BuildType: "clang-cl" + - BuildType: "msvc-x64" - BuildType: "msvc" + - BuildType: "clang-cl" +# - BuildType: vssolution version: reactos.appveyor.{build} skip_branch_with_pr: true @@ -22,13 +24,34 @@ init: build_script: - set PATH=C:\RosCMakeNinja\bin;%PATH% - - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 + - if "%BuildType%" == "msvc-x64" ( + call "C:\PROGRA~2\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + ) else ( + call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 + ) - cmake --version - md c:\ros_build - cd c:\ros_build - call %APPVEYOR_BUILD_FOLDER%\configure.cmd %clang_configure_option% -DENABLE_ROSTESTS=1 - - ninja -k0 - - ninja bootcd + - ps: >- + & ninja -k0 2>&1 | select-string -pattern "\[\d+\/\d+\] " -NotMatch | %{$_.Line} + - ps: >- + & ninja bootcd 2>&1 | select-string -pattern "\[\d+\/\d+\] " -NotMatch | %{$_.Line} test: off deploy: off + +for: +- + matrix: + only: + - BuildType: vssolution + + build_script: + - set PATH=C:\RosCMakeNinja\bin;%PATH% + - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 + - cmake --version + - md C:\ros_build + - cd C:\ros_build + - call %APPVEYOR_BUILD_FOLDER%\configure.cmd VSSolution -DENABLE_ROSTESTS=1 + - msbuild /verbosity:quiet /target:bootcd REACTOS.sln