appveyor: fix yamlint issues, indent
Also: - use double quotes in all batch if statements. Closes #11994
This commit is contained in:
Viktor Szakats
parent
da5dcb7007
commit
a1d73a6bbf
183
appveyor.yml
183
appveyor.yml
@ -40,11 +40,11 @@ environment:
|
||||
BUILD_SYSTEM: CMake
|
||||
PRJ_GEN: "Visual Studio 9 2008"
|
||||
PRJ_CFG: Release
|
||||
SCHANNEL: ON
|
||||
ENABLE_UNICODE: OFF
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: OFF
|
||||
SHARED: ON
|
||||
SCHANNEL: "ON"
|
||||
ENABLE_UNICODE: "OFF"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "OFF"
|
||||
SHARED: "ON"
|
||||
DISABLED_TESTS: ""
|
||||
# MSVCR90.dll missing
|
||||
RUN: "OFF"
|
||||
@ -54,14 +54,14 @@ environment:
|
||||
PRJ_GEN: "Visual Studio 17 2022"
|
||||
TARGET: "-A x64"
|
||||
PRJ_CFG: Release
|
||||
OPENSSL: ON
|
||||
SCHANNEL: OFF
|
||||
ENABLE_UNICODE: OFF
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: OFF
|
||||
SHARED: ON
|
||||
OPENSSL: "ON"
|
||||
SCHANNEL: "OFF"
|
||||
ENABLE_UNICODE: "OFF"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "OFF"
|
||||
SHARED: "ON"
|
||||
DISABLED_TESTS: ""
|
||||
WEBSOCKETS: ON
|
||||
WEBSOCKETS: "ON"
|
||||
UNITY: "ON"
|
||||
- job_name: "CMake, VS2022, Release arm64, Schannel, Static"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022"
|
||||
@ -69,10 +69,10 @@ environment:
|
||||
PRJ_GEN: "Visual Studio 17 2022"
|
||||
TARGET: "-A ARM64"
|
||||
PRJ_CFG: Release
|
||||
SCHANNEL: ON
|
||||
ENABLE_UNICODE: OFF
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: OFF
|
||||
SCHANNEL: "ON"
|
||||
ENABLE_UNICODE: "OFF"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "OFF"
|
||||
DISABLED_TESTS: ""
|
||||
# generated CMake-based Visual Studio Debug builds
|
||||
- job_name: "CMake, VS2010, Debug x64, no SSL, Static"
|
||||
@ -80,10 +80,10 @@ environment:
|
||||
BUILD_SYSTEM: CMake
|
||||
PRJ_GEN: "Visual Studio 10 2010 Win64"
|
||||
PRJ_CFG: Debug
|
||||
SCHANNEL: OFF
|
||||
ENABLE_UNICODE: OFF
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: ON
|
||||
SCHANNEL: "OFF"
|
||||
ENABLE_UNICODE: "OFF"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "!1139 !1501"
|
||||
ADD_PATH: "C:\\msys64\\usr\\bin"
|
||||
- job_name: "CMake, VS2022, Debug x64, Schannel, Static, Unicode"
|
||||
@ -92,10 +92,10 @@ environment:
|
||||
PRJ_GEN: "Visual Studio 17 2022"
|
||||
TARGET: "-A x64"
|
||||
PRJ_CFG: Debug
|
||||
SCHANNEL: ON
|
||||
ENABLE_UNICODE: ON
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: ON
|
||||
SCHANNEL: "ON"
|
||||
ENABLE_UNICODE: "ON"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "~571 !1139 !1501"
|
||||
ADD_PATH: "C:\\msys64\\usr\\bin"
|
||||
- job_name: "CMake, VS2022, Debug x64, no SSL, Static"
|
||||
@ -104,10 +104,10 @@ environment:
|
||||
PRJ_GEN: "Visual Studio 17 2022"
|
||||
TARGET: "-A x64"
|
||||
PRJ_CFG: Debug
|
||||
SCHANNEL: OFF
|
||||
ENABLE_UNICODE: OFF
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: ON
|
||||
SCHANNEL: "OFF"
|
||||
ENABLE_UNICODE: "OFF"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "~571 !1139 !1501"
|
||||
ADD_PATH: "C:\\msys64\\usr\\bin"
|
||||
- job_name: "CMake, VS2022, Debug x64, no SSL, Static, HTTP only"
|
||||
@ -116,10 +116,10 @@ environment:
|
||||
PRJ_GEN: "Visual Studio 17 2022"
|
||||
TARGET: "-A x64"
|
||||
PRJ_CFG: Debug
|
||||
SCHANNEL: OFF
|
||||
ENABLE_UNICODE: OFF
|
||||
HTTP_ONLY: ON
|
||||
TESTING: ON
|
||||
SCHANNEL: "OFF"
|
||||
ENABLE_UNICODE: "OFF"
|
||||
HTTP_ONLY: "ON"
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "!1139 !1501"
|
||||
ADD_PATH: "C:\\msys64\\usr\\bin"
|
||||
# generated CMake-based MSYS Makefiles builds (mingw cross-compiling)
|
||||
@ -128,10 +128,10 @@ environment:
|
||||
BUILD_SYSTEM: CMake
|
||||
PRJ_GEN: "MSYS Makefiles"
|
||||
PRJ_CFG: Debug
|
||||
SCHANNEL: ON
|
||||
ENABLE_UNICODE: ON
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: ON
|
||||
SCHANNEL: "ON"
|
||||
ENABLE_UNICODE: "ON"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "!1139 !1501"
|
||||
ADD_PATH: "C:\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin;C:\\msys64\\usr\\bin"
|
||||
MSYS2_ARG_CONV_EXCL: "/*"
|
||||
@ -141,10 +141,10 @@ environment:
|
||||
BUILD_SYSTEM: CMake
|
||||
PRJ_GEN: "MSYS Makefiles"
|
||||
PRJ_CFG: Debug
|
||||
SCHANNEL: ON
|
||||
ENABLE_UNICODE: ON
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: ON
|
||||
SCHANNEL: "ON"
|
||||
ENABLE_UNICODE: "ON"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "!1139 !1501"
|
||||
ADD_PATH: "C:\\mingw-w64\\x86_64-7.2.0-posix-seh-rt_v5-rev1\\mingw64\\bin;C:\\msys64\\usr\\bin"
|
||||
MSYS2_ARG_CONV_EXCL: "/*"
|
||||
@ -154,10 +154,10 @@ environment:
|
||||
BUILD_SYSTEM: CMake
|
||||
PRJ_GEN: "MSYS Makefiles"
|
||||
PRJ_CFG: Debug
|
||||
SCHANNEL: ON
|
||||
ENABLE_UNICODE: OFF
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: OFF
|
||||
SCHANNEL: "ON"
|
||||
ENABLE_UNICODE: "OFF"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "OFF"
|
||||
ADD_PATH: "C:\\msys64\\mingw64\\bin;C:\\msys64\\usr\\bin"
|
||||
MSYS2_ARG_CONV_EXCL: "/*"
|
||||
BUILD_OPT: -k
|
||||
@ -167,10 +167,10 @@ environment:
|
||||
BUILD_SYSTEM: CMake
|
||||
PRJ_GEN: "MSYS Makefiles"
|
||||
PRJ_CFG: Debug
|
||||
SCHANNEL: ON
|
||||
ENABLE_UNICODE: OFF
|
||||
HTTP_ONLY: OFF
|
||||
TESTING: ON
|
||||
SCHANNEL: "ON"
|
||||
ENABLE_UNICODE: "OFF"
|
||||
HTTP_ONLY: "OFF"
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "!1139 !1501"
|
||||
ADD_PATH: "C:\\mingw-w64\\i686-6.3.0-posix-dwarf-rt_v5-rev1\\mingw32\\bin;C:\\msys64\\usr\\bin"
|
||||
MSYS2_ARG_CONV_EXCL: "/*"
|
||||
@ -179,85 +179,85 @@ environment:
|
||||
- job_name: "winbuild, VS2015, Debug"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
||||
BUILD_SYSTEM: winbuild_vs2015
|
||||
DEBUG: yes
|
||||
DEBUG: "yes"
|
||||
PATHPART: debug
|
||||
TESTING: OFF
|
||||
ENABLE_UNICODE: no
|
||||
TESTING: "OFF"
|
||||
ENABLE_UNICODE: "no"
|
||||
- job_name: "winbuild, VS2015, Release"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
||||
BUILD_SYSTEM: winbuild_vs2015
|
||||
DEBUG: no
|
||||
DEBUG: "no"
|
||||
PATHPART: release
|
||||
TESTING: OFF
|
||||
ENABLE_UNICODE: no
|
||||
TESTING: "OFF"
|
||||
ENABLE_UNICODE: "no"
|
||||
- job_name: "winbuild, VS2017, Debug"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||
BUILD_SYSTEM: winbuild_vs2017
|
||||
DEBUG: yes
|
||||
DEBUG: "yes"
|
||||
PATHPART: debug
|
||||
TESTING: OFF
|
||||
ENABLE_UNICODE: no
|
||||
TESTING: "OFF"
|
||||
ENABLE_UNICODE: "no"
|
||||
- job_name: "winbuild, VS2017, Release"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||
BUILD_SYSTEM: winbuild_vs2017
|
||||
DEBUG: no
|
||||
DEBUG: "no"
|
||||
PATHPART: release
|
||||
TESTING: OFF
|
||||
ENABLE_UNICODE: no
|
||||
TESTING: "OFF"
|
||||
ENABLE_UNICODE: "no"
|
||||
- job_name: "winbuild, VS2015, Debug, Unicode"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
||||
BUILD_SYSTEM: winbuild_vs2015
|
||||
DEBUG: yes
|
||||
DEBUG: "yes"
|
||||
PATHPART: debug
|
||||
TESTING: OFF
|
||||
ENABLE_UNICODE: yes
|
||||
TESTING: "OFF"
|
||||
ENABLE_UNICODE: "yes"
|
||||
- job_name: "winbuild, VS2015, Release, Unicode"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
||||
BUILD_SYSTEM: winbuild_vs2015
|
||||
DEBUG: no
|
||||
DEBUG: "no"
|
||||
PATHPART: release
|
||||
TESTING: OFF
|
||||
ENABLE_UNICODE: yes
|
||||
TESTING: "OFF"
|
||||
ENABLE_UNICODE: "yes"
|
||||
- job_name: "winbuild, VS2017, Debug, Unicode"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||
BUILD_SYSTEM: winbuild_vs2017
|
||||
DEBUG: yes
|
||||
DEBUG: "yes"
|
||||
PATHPART: debug
|
||||
TESTING: OFF
|
||||
ENABLE_UNICODE: yes
|
||||
TESTING: "OFF"
|
||||
ENABLE_UNICODE: "yes"
|
||||
- job_name: "winbuild, VS2017, Release, Unicode"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||
BUILD_SYSTEM: winbuild_vs2017
|
||||
DEBUG: no
|
||||
DEBUG: "no"
|
||||
PATHPART: release
|
||||
TESTING: OFF
|
||||
ENABLE_UNICODE: yes
|
||||
TESTING: "OFF"
|
||||
ENABLE_UNICODE: "yes"
|
||||
# generated VisualStudioSolution-based builds
|
||||
- job_name: "VisualStudioSolution, VS2017, Debug"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||
BUILD_SYSTEM: VisualStudioSolution
|
||||
PRJ_CFG: "DLL Debug - DLL Windows SSPI - DLL WinIDN"
|
||||
TESTING: OFF
|
||||
TESTING: "OFF"
|
||||
VC_VERSION: VC14.10
|
||||
# autotools-based builds (NOT mingw cross-compiling, but msys2 native)
|
||||
- job_name: "autotools, msys2, Debug, no Proxy, no SSL"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||
BUILD_SYSTEM: autotools
|
||||
TESTING: ON
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "!19 !1233"
|
||||
ADD_PATH: "C:\\msys64\\usr\\bin"
|
||||
CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --disable-proxy --without-ssl --enable-websockets"
|
||||
- job_name: "autotools, msys2, Debug, no SSL"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||
BUILD_SYSTEM: autotools
|
||||
TESTING: ON
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "!19 !504 !704 !705 !1233"
|
||||
ADD_PATH: "C:\\msys64\\usr\\bin"
|
||||
CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --without-ssl --enable-websockets"
|
||||
- job_name: "autotools, msys2, Release, no SSL"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||
BUILD_SYSTEM: autotools
|
||||
TESTING: ON
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: "!19 !504 !704 !705 !1233"
|
||||
ADD_PATH: "C:\\msys64\\usr\\bin"
|
||||
CONFIG_ARGS: "--enable-warnings --enable-werror --without-ssl --enable-websockets"
|
||||
@ -265,18 +265,18 @@ environment:
|
||||
- job_name: "autotools, cygwin, Debug, no SSL"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022"
|
||||
BUILD_SYSTEM: autotools
|
||||
TESTING: ON
|
||||
TESTING: "ON"
|
||||
DISABLED_TESTS: ""
|
||||
ADD_PATH: "C:\\cygwin64\\bin"
|
||||
CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --without-ssl --enable-websockets"
|
||||
POSIX_PATH_PREFIX: "/cygdrive"
|
||||
|
||||
install:
|
||||
- if not "%ADD_PATH%"=="" (
|
||||
- if not "%ADD_PATH%" == "" (
|
||||
set "PATH=%ADD_PATH%;%PATH%" )
|
||||
|
||||
build_script:
|
||||
- if %BUILD_SYSTEM%==CMake (
|
||||
- if "%BUILD_SYSTEM%" == "CMake" (
|
||||
cmake .
|
||||
-G"%PRJ_GEN%"
|
||||
%TARGET%
|
||||
@ -305,7 +305,7 @@ build_script:
|
||||
if "%RUN%" == "ON" (
|
||||
src\curl.exe -V )
|
||||
) else (
|
||||
if %BUILD_SYSTEM%==VisualStudioSolution (
|
||||
if "%BUILD_SYSTEM%" == "VisualStudioSolution" (
|
||||
cd projects &&
|
||||
.\generate.bat %VC_VERSION% &&
|
||||
msbuild.exe /p:Configuration="%PRJ_CFG%" "Windows\\%VC_VERSION%\\curl-all.sln" &&
|
||||
@ -313,7 +313,7 @@ build_script:
|
||||
cd "../build/Win32/%VC_VERSION%/%PRJ_CFG%" &&
|
||||
curld.exe -V
|
||||
) else (
|
||||
if %BUILD_SYSTEM%==winbuild_vs2015 (
|
||||
if "%BUILD_SYSTEM%" == "winbuild_vs2015" (
|
||||
call buildconf.bat &&
|
||||
cd winbuild &&
|
||||
call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 &&
|
||||
@ -322,22 +322,23 @@ build_script:
|
||||
bash.exe -e -l -c "find %POSIX_PATH_PREFIX%/c/projects/curl -name '*.exe' -o -name '*.dll'" &&
|
||||
..\builds\libcurl-vc14-x64-%PATHPART%-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
|
||||
) else (
|
||||
if %BUILD_SYSTEM%==winbuild_vs2017 (
|
||||
if "%BUILD_SYSTEM%" == "winbuild_vs2017" (
|
||||
call buildconf.bat &&
|
||||
cd winbuild &&
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" &&
|
||||
nmake /f Makefile.vc mode=dll VC=14.10 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64 DEBUG=%DEBUG% ENABLE_UNICODE=%ENABLE_UNICODE% &&
|
||||
..\builds\libcurl-vc14.10-x64-%PATHPART%-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
|
||||
) else (
|
||||
if %BUILD_SYSTEM%==autotools (
|
||||
if "%BUILD_SYSTEM%" == "autotools" (
|
||||
bash.exe -e -l -c "cd %POSIX_PATH_PREFIX%/c/projects/curl && autoreconf -fi && ./configure %CONFIG_ARGS% && make V=1 && make V=1 examples && cd tests && make V=1" &&
|
||||
src\curl.exe -V
|
||||
)))))
|
||||
# - ps: if(Test-Path CMakeFiles/CMakeConfigureLog.yaml) { cat CMakeFiles/CMakeConfigureLog.yaml }
|
||||
# - ps: if(Test-Path CMakeFiles/CMakeOutput.log) { cat CMakeFiles/CMakeOutput.log }
|
||||
# - ps: if(Test-Path CMakeFiles/CMakeError.log) { cat CMakeFiles/CMakeError.log }
|
||||
- if %TESTING%==ON (
|
||||
if %BUILD_SYSTEM%==CMake (
|
||||
# - ps: |
|
||||
# if(Test-Path CMakeFiles/CMakeConfigureLog.yaml) { cat CMakeFiles/CMakeConfigureLog.yaml }
|
||||
# if(Test-Path CMakeFiles/CMakeOutput.log) { cat CMakeFiles/CMakeOutput.log }
|
||||
# if(Test-Path CMakeFiles/CMakeError.log) { cat CMakeFiles/CMakeError.log }
|
||||
- if "%TESTING%" == "ON" (
|
||||
if "%BUILD_SYSTEM%" == "CMake" (
|
||||
cmake --build . --config %PRJ_CFG% --parallel 2 --target testdeps
|
||||
))
|
||||
|
||||
@ -346,12 +347,12 @@ test_script:
|
||||
set ACURL=-ac %POSIX_PATH_PREFIX%/c/msys64/usr/bin/curl.exe )
|
||||
- if exist C:/Windows/System32/curl.exe (
|
||||
set ACURL=-ac %POSIX_PATH_PREFIX%/c/Windows/System32/curl.exe )
|
||||
- if %TESTING%==ON (
|
||||
if %BUILD_SYSTEM%==CMake (
|
||||
- if "%TESTING%" == "ON" (
|
||||
if "%BUILD_SYSTEM%" == "CMake" (
|
||||
set TFLAGS=%ACURL% %DISABLED_TESTS% &&
|
||||
cmake --build . --config %PRJ_CFG% --target test-ci
|
||||
) else (
|
||||
if %BUILD_SYSTEM%==autotools (
|
||||
if "%BUILD_SYSTEM%" == "autotools" (
|
||||
bash.exe -e -l -c "cd %POSIX_PATH_PREFIX%/c/projects/curl && make V=1 TFLAGS='%ACURL% %DISABLED_TESTS%' test-ci"
|
||||
) else (
|
||||
bash.exe -e -l -c "cd %POSIX_PATH_PREFIX%/c/projects/curl/tests && ./runtests.pl -a -p !flaky -r -rm %ACURL% %DISABLED_TESTS%"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user