From 804c3ba6e9e8f51f49df7cd85e547a8ff0c8bb5b Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 9 May 2020 14:56:39 +0100 Subject: Upgrade to C++17 [CI] (#4716) * Update CI * Reduce one build to minimum cmake version * Update compile instructions with new minimum versions * Update more guides * Run debug build with VS 2017 Co-authored-by: Peter Bell --- appveyor.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'appveyor.yml') diff --git a/appveyor.yml b/appveyor.yml index c66be5f12..bb3847585 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,10 @@ version: 1.0.{build} -image: Visual Studio 2015 clone_depth: 50 +image: +- Visual Studio 2019 +- Visual Studio 2017 + # Set up environment variables for build info environment: CUBERITE_BUILD_SERIES_NAME: AppVeyor @@ -21,6 +24,14 @@ environment: configuration: Release BUILD_DIR: Release-x64 +matrix: + exclude: + - image: Visual Studio 2017 + configuration: Release + - image: Visual Studio 2019 + configuration: Debug + + install: - echo %TIME% - git submodule update --init @@ -38,7 +49,8 @@ for: - if not exist %BUILD_DIR% mkdir %BUILD_DIR% - cd %BUILD_DIR% - echo %TIME% - - cmake -G "Visual Studio 14 2015 Win64" -DSELF_TEST=1 -DBUILD_TOOLS=1 .. + # TODO: re-add -DSELF_TEST=YES -DBUILD_TOOLS=YES once PCH for tools enabled (too slow otherwise) + - cmake -G "Visual Studio 15 2017" -A "x64" -DSELF_TEST=NO -DBUILD_TOOLS=NO .. - echo %TIME% - cd .. @@ -63,7 +75,7 @@ for: - if not exist %BUILD_DIR% mkdir %BUILD_DIR% - cd %BUILD_DIR% - echo %TIME% - - cmake -G "Visual Studio 14 2015" .. + - cmake -G "Visual Studio 16 2019" .. - echo %TIME% - cd .. @@ -88,7 +100,7 @@ for: - if not exist %BUILD_DIR% mkdir %BUILD_DIR% - cd %BUILD_DIR% - echo %TIME% - - cmake -G "Visual Studio 14 2015 Win64" .. + - cmake -G "Visual Studio 16 2019" -A "x64" .. - echo %TIME% - cd .. -- cgit v1.2.3