luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

appveyor: enable cmake unity mode by default

Browse Source 
Leave one non-unity cmake job. This makes the jobs finish slightly
quicker, while giving more coverage for unity issues.

Before:
https://ci.appveyor.com/project/curlorg/curl/builds/49496977
https://ci.appveyor.com/project/curlorg/curl/builds/49500372
After:
https://ci.appveyor.com/project/curlorg/curl/builds/49500338

Also fixup unrelated whitespace.

Reviewed-by: Daniel Stenberg
Closes #13217
This commit is contained in:
Viktor Szakats 2024-03-28 09:07:35 +00:00
parent 9496d1d678
commit 29bfde9fea
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
appveyor.yml
View File

@ -31,7 +31,7 @@
version: 7.50.0.{build} version: 7.50.0.{build}
environment: environment:
UNITY: 'OFF' UNITY: 'ON'
OPENSSL: 'OFF' OPENSSL: 'OFF'
DEBUG: 'ON' DEBUG: 'ON'
SHARED: 'OFF' SHARED: 'OFF'
@ -48,7 +48,7 @@ environment:
SHARED: 'ON' SHARED: 'ON'
TESTING: 'OFF' TESTING: 'OFF'
DISABLED_TESTS: '' DISABLED_TESTS: ''
- job_name: 'CMake, VS2022, Release, x64, OpenSSL 1.1.1, WebSockets, Unity, Build-only' - job_name: 'CMake, VS2022, Release, x64, OpenSSL 1.1.1, WebSockets, Build-only'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
BUILD_SYSTEM: CMake BUILD_SYSTEM: CMake
PRJ_GEN: 'Visual Studio 17 2022' PRJ_GEN: 'Visual Studio 17 2022'
@ -62,7 +62,6 @@ environment:
TESTING: 'OFF' TESTING: 'OFF'
DISABLED_TESTS: '' DISABLED_TESTS: ''
WEBSOCKETS: 'ON' WEBSOCKETS: 'ON'
UNITY: 'ON'
- job_name: 'CMake, VS2022, Release, arm64, Schannel, Static, Build-only' - job_name: 'CMake, VS2022, Release, arm64, Schannel, Static, Build-only'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
BUILD_SYSTEM: CMake BUILD_SYSTEM: CMake
@ -119,7 +118,7 @@ environment:
TESTING: 'ON' TESTING: 'ON'
DISABLED_TESTS: '!1139 !1501 !1177 !1477' DISABLED_TESTS: '!1139 !1501 !1177 !1477'
# generated CMake-based MSYS Makefiles builds (mingw cross-compiling) # generated CMake-based MSYS Makefiles builds (mingw cross-compiling)
- job_name: 'CMake, mingw-w64, gcc 13, Debug, x64, Schannel, Static, Unicode, Unity' - job_name: 'CMake, mingw-w64, gcc 13, Debug, x64, Schannel, Static, Unicode'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
BUILD_SYSTEM: CMake BUILD_SYSTEM: CMake
PRJ_GEN: 'MSYS Makefiles' PRJ_GEN: 'MSYS Makefiles'
@ -132,7 +131,6 @@ environment:
ADD_PATH: 'C:/msys64/mingw64/bin' ADD_PATH: 'C:/msys64/mingw64/bin'
MSYS2_ARG_CONV_EXCL: '/*' MSYS2_ARG_CONV_EXCL: '/*'
BUILD_OPT: -k BUILD_OPT: -k
UNITY: 'ON'
- job_name: 'CMake, mingw-w64, gcc 7, Debug, x64, Schannel, Static, Unicode' - job_name: 'CMake, mingw-w64, gcc 7, Debug, x64, Schannel, Static, Unicode'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017'
BUILD_SYSTEM: CMake BUILD_SYSTEM: CMake
@ -146,7 +144,7 @@ environment:
ADD_PATH: 'C:/mingw-w64/x86_64-7.2.0-posix-seh-rt_v5-rev1/mingw64/bin' ADD_PATH: 'C:/mingw-w64/x86_64-7.2.0-posix-seh-rt_v5-rev1/mingw64/bin'
MSYS2_ARG_CONV_EXCL: '/*' MSYS2_ARG_CONV_EXCL: '/*'
BUILD_OPT: -k BUILD_OPT: -k
- job_name: 'CMake, mingw-w64, gcc 9, Debug, x64, Schannel, Static, Unity' - job_name: 'CMake, mingw-w64, gcc 9, Debug, x64, Schannel, Static'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017'
BUILD_SYSTEM: CMake BUILD_SYSTEM: CMake
PRJ_GEN: 'MSYS Makefiles' PRJ_GEN: 'MSYS Makefiles'
@ -160,8 +158,7 @@ environment:
ADD_PATH: 'C:/msys64/mingw64/bin' ADD_PATH: 'C:/msys64/mingw64/bin'
MSYS2_ARG_CONV_EXCL: '/*' MSYS2_ARG_CONV_EXCL: '/*'
BUILD_OPT: -k BUILD_OPT: -k
UNITY: 'ON' - job_name: 'CMake, mingw-w64, gcc 6, Debug, x86, Schannel, Static, no-unity'
- job_name: 'CMake, mingw-w64, gcc 6, Debug, x86, Schannel, Static'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
BUILD_SYSTEM: CMake BUILD_SYSTEM: CMake
PRJ_GEN: 'MSYS Makefiles' PRJ_GEN: 'MSYS Makefiles'
@ -174,6 +171,7 @@ environment:
ADD_PATH: 'C:/mingw-w64/i686-6.3.0-posix-dwarf-rt_v5-rev1/mingw32/bin' ADD_PATH: 'C:/mingw-w64/i686-6.3.0-posix-dwarf-rt_v5-rev1/mingw32/bin'
MSYS2_ARG_CONV_EXCL: '/*' MSYS2_ARG_CONV_EXCL: '/*'
BUILD_OPT: -k BUILD_OPT: -k
UNITY: 'OFF'
# winbuild-based builds # winbuild-based builds
- job_name: 'winbuild, VS2015, Debug, x64, OpenSSL 1.1.1, Build-only' - job_name: 'winbuild, VS2015, Debug, x64, OpenSSL 1.1.1, Build-only'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
@ -250,13 +248,13 @@ environment:
BUILD_SYSTEM: autotools BUILD_SYSTEM: autotools
TESTING: 'ON' TESTING: 'ON'
DISABLED_TESTS: '!19 !504 !704 !705 !1233' DISABLED_TESTS: '!19 !504 !704 !705 !1233'
CONFIG_ARGS: '--enable-debug --enable-werror --disable-threaded-resolver --without-ssl --enable-websockets --without-libpsl' CONFIG_ARGS: '--enable-debug --enable-werror --disable-threaded-resolver --without-ssl --enable-websockets --without-libpsl'
- job_name: 'autotools, msys2, Release, x86_64, no SSL' - job_name: 'autotools, msys2, Release, x86_64, no SSL'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017'
BUILD_SYSTEM: autotools BUILD_SYSTEM: autotools
TESTING: 'ON' TESTING: 'ON'
DISABLED_TESTS: '!19 !504 !704 !705 !1233' DISABLED_TESTS: '!19 !504 !704 !705 !1233'
CONFIG_ARGS: '--enable-warnings --enable-werror --without-ssl --enable-websockets --without-libpsl' CONFIG_ARGS: '--enable-warnings --enable-werror --without-ssl --enable-websockets --without-libpsl'
# autotools-based Cygwin build # autotools-based Cygwin build
- job_name: 'autotools, cygwin, Debug, x86_64, no SSL' - job_name: 'autotools, cygwin, Debug, x86_64, no SSL'
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022'
@ -264,7 +262,7 @@ environment:
TESTING: 'ON' TESTING: 'ON'
DISABLED_TESTS: '' DISABLED_TESTS: ''
ADD_SHELL: 'C:/cygwin64/bin' ADD_SHELL: 'C:/cygwin64/bin'
CONFIG_ARGS: '--enable-debug --enable-werror --disable-threaded-resolver --without-ssl --enable-websockets --without-libpsl' CONFIG_ARGS: '--enable-debug --enable-werror --disable-threaded-resolver --without-ssl --enable-websockets --without-libpsl'
install: install:
- ps: | - ps: |