From 4c94fcd52bc479d5869e7a10da5eda986fe0d9a8 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Mon, 21 Oct 2019 14:28:12 +0200 Subject: [PATCH] add msvc2019 and ditch msvc2015 --- CI/before_script.msvc.sh | 6 +++--- appveyor.yml | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 60bdb9c974..1eae71c7f2 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -247,7 +247,7 @@ if [ -z $CONFIGURATION ]; then fi if [ -z $VS_VERSION ]; then - VS_VERSION="2013" + VS_VERSION="2017" fi case $VS_VERSION in @@ -507,10 +507,10 @@ fi add_cmake_opts -DBoost_COMPILER="-${TOOLSET}" echo Done. else - # Appveyor unstable has all the boost we need already + # Appveyor has all the boost we need already BOOST_SDK="c:/Libraries/boost_${BOOST_VER_URL}" - if [ $MSVC_REAL_VER -eq 15 ]; then + if [ $MSVC_REAL_VER -ge 15 ]; then LIB_SUFFIX="1" else LIB_SUFFIX="0" diff --git a/appveyor.yml b/appveyor.yml index 90a9cb1bcf..5095e7abd8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,13 +8,10 @@ branches: environment: matrix: - - msvc: 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - msvc: 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 -matrix: - allow_failures: - - msvc: 2015 + - msvc: 2019 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 platform: # - Win32