From 878a08ea7803b65125c728bc7e5aa796cccf81e2 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Sat, 8 Jan 2022 00:08:18 +0100 Subject: [PATCH 1/4] ci-build vs-versions adjusted instead of 2017 build with 2022, additional build with vs2008 to test "ancient environment" --- appveyor.yml | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 75be1aa2..68cdf79f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -132,6 +132,16 @@ environment: CMAKE_ARGS: '-DPDC_UTF8=ON' ARCHIVE_BASENAME: UTF8_X86 + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2013' + ARCHITECTURE: amd64_x86 + CMAKE_ARGS: '-DPDC_WIDE=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON' + ARCHIVE_BASENAME: WIDE_x86 + + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2013' + ARCHITECTURE: amd64_x86 + CMAKE_ARGS: '-DPDC_UTF8=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON' + ARCHIVE_BASENAME: UTF8_x86 + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015' ARCHITECTURE: amd64_x86 CMAKE_ARGS: '-DPDC_WIDE=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON' @@ -162,42 +172,42 @@ environment: CMAKE_ARGS: '-DPDC_UTF8=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF' ARCHIVE_BASENAME: UTF8_ARM - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' ARCHITECTURE: amd64_arm CMAKE_ARGS: '-DPDC_WIDE=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF' ARCHIVE_BASENAME: WIDE_ARM - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' ARCHITECTURE: amd64_arm CMAKE_ARGS: '-DPDC_UTF8=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF' ARCHIVE_BASENAME: UTF8_ARM - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' ARCHITECTURE: amd64_arm64 CMAKE_ARGS: '-DPDC_WIDE=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF' ARCHIVE_BASENAME: WIDE_ARM64 - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' ARCHITECTURE: amd64_arm64 CMAKE_ARGS: '-DPDC_UTF8=ON -DPDC_SDL2_BUILD=OFF -DPDC_SDL2_DEPS_BUILD=OFF' ARCHIVE_BASENAME: UTF8_ARM64 - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' ARCHITECTURE: amd64_x86 CMAKE_ARGS: '-DPDC_WIDE=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON' ARCHIVE_BASENAME: WIDE_x86 - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' ARCHITECTURE: amd64_x86 CMAKE_ARGS: '-DPDC_UTF8=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON' ARCHIVE_BASENAME: UTF8_x86 - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' ARCHITECTURE: amd64 CMAKE_ARGS: '-DPDC_WIDE=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON' ARCHIVE_BASENAME: WIDE_x64 - - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' + - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' ARCHITECTURE: amd64 CMAKE_ARGS: '-DPDC_UTF8=ON -DPDC_SDL2_BUILD=ON -DPDC_SDL2_DEPS_BUILD=ON' ARCHIVE_BASENAME: UTF8_x64 @@ -208,12 +218,17 @@ init: - set CURL_ARGS=--location --fail --show-error --keepalive-time 10 --connect-timeout 10 --max-time 60 # Setup TOOLCHAIN for Visual Studio build tools - if not DEFINED TOOLCHAIN ( - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" ( + if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" ( + # one "ancient" environment for testing + set "TOOLCHAIN=VS2008" + ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" ( set "TOOLCHAIN=VS2015" ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" ( set "TOOLCHAIN=VS2017" ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2019" ( set "TOOLCHAIN=VS2019" + ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2022" ( + set "TOOLCHAIN=VS2022" ) ) # Setup TOOLCHAIN group variable as CMake Generator @@ -235,13 +250,12 @@ init: set "ARTIFACT_NAME=open-watcom-2_0-c-win-x64.exe" && set "ARTIFACT_URL=https://github.com/open-watcom/open-watcom-v2/releases/download/Current-build" && set "PATH=%WATCOM%\BINNT64;%WATCOM%\BINW;%PATH%" + ) else if "%TOOLCHAIN%"=="VS2013" ( + set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" ) else if "%TOOLCHAIN%"=="VS2015" ( set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" - ) else if "%TOOLCHAIN%"=="VS2017" ( - set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" - ) else if "%TOOLCHAIN%"=="VS2019" ( - set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" - ) + ) else if "%TOOLCHAIN:~0,4%"=="VS20" ( + set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio\%TOOLCHAIN:~2,4%\Community\VC\Auxiliary\Build\vcvarsall.bat" # Setup Archive name - set "ARCHIVE=%TOOLCHAIN%_%CONFIGURATION%_%ARCHIVE_BASENAME%_%APPVEYOR_BUILD_NUMBER%" From 1567de7c675cd86ed26bc98d9d313ac86c2e578b Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Sat, 8 Jan 2022 00:10:33 +0100 Subject: [PATCH 2/4] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 68cdf79f..6cb1f46d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -219,7 +219,7 @@ init: # Setup TOOLCHAIN for Visual Studio build tools - if not DEFINED TOOLCHAIN ( if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" ( - # one "ancient" environment for testing + rem one "ancient" environment for testing set "TOOLCHAIN=VS2008" ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" ( set "TOOLCHAIN=VS2015" From 18fdb3b57048ec933c9bedd324128ab6184f73b4 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Sun, 9 Jan 2022 00:23:34 +0100 Subject: [PATCH 3/4] Update appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 6cb1f46d..6bd5afa6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -256,6 +256,7 @@ init: set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ) else if "%TOOLCHAIN:~0,4%"=="VS20" ( set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio\%TOOLCHAIN:~2,4%\Community\VC\Auxiliary\Build\vcvarsall.bat" + ) # Setup Archive name - set "ARCHIVE=%TOOLCHAIN%_%CONFIGURATION%_%ARCHIVE_BASENAME%_%APPVEYOR_BUILD_NUMBER%" From 9b2bf8453755cb3ef07d60d0846229c3058c91a6 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Sun, 9 Jan 2022 00:25:22 +0100 Subject: [PATCH 4/4] Update appveyor.yml --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6bd5afa6..018167cb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -216,10 +216,9 @@ init: - echo BUILD_NUMBER=%APPVEYOR_BUILD_NUMBER% # curl defaults --keepalive-time 60 --max-time ?? about 10 minutes --connect-timeout ?? - set CURL_ARGS=--location --fail --show-error --keepalive-time 10 --connect-timeout 10 --max-time 60 - # Setup TOOLCHAIN for Visual Studio build tools + # Setup TOOLCHAIN for Visual Studio build tools, VS2013 as "ancient" test using VC2008 Express - if not DEFINED TOOLCHAIN ( if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" ( - rem one "ancient" environment for testing set "TOOLCHAIN=VS2008" ) else if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" ( set "TOOLCHAIN=VS2015"