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

appveyor: only add MSYS2 to PATH where required

Browse Source 
Closes https://github.com/curl/curl/pull/8693
This commit is contained in:
Marcel Raad 2019-03-02 11:53:33 +01:00
parent cd29c1651e
commit 84be999672
No known key found for this signature in database
GPG Key ID: 33C416EFAE4D6F02
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
appveyor.yml
View File

@ -36,7 +36,6 @@ environment:
TESTING: OFF TESTING: OFF
SHARED: ON SHARED: ON
DISABLED_TESTS: "" DISABLED_TESTS: ""
COMPILER_PATH: ""
- 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"
@ -49,7 +48,6 @@ environment:
TESTING: OFF TESTING: OFF
SHARED: ON SHARED: ON
DISABLED_TESTS: "" DISABLED_TESTS: ""
COMPILER_PATH: ""
- 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 +60,6 @@ environment:
TESTING: OFF TESTING: OFF
SHARED: OFF SHARED: OFF
DISABLED_TESTS: "" DISABLED_TESTS: ""
COMPILER_PATH: ""
# generated CMake-based Visual Studio Debug builds # generated CMake-based Visual Studio Debug builds
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
BUILD_SYSTEM: CMake BUILD_SYSTEM: CMake
@ -75,7 +72,7 @@ environment:
TESTING: ON TESTING: ON
SHARED: OFF SHARED: OFF
DISABLED_TESTS: "!1139 !1501" DISABLED_TESTS: "!1139 !1501"
COMPILER_PATH: "" ADD_PATH: "C:\\msys64\\usr\\bin"
- 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"
@ -88,7 +85,7 @@ environment:
TESTING: ON TESTING: ON
SHARED: OFF SHARED: OFF
DISABLED_TESTS: "~571 !1139 !1501 " DISABLED_TESTS: "~571 !1139 !1501 "
COMPILER_PATH: "" ADD_PATH: "C:\\msys64\\usr\\bin"
- 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"
@ -101,7 +98,7 @@ environment:
TESTING: ON TESTING: ON
SHARED: OFF SHARED: OFF
DISABLED_TESTS: "~571 !1139 !1501" DISABLED_TESTS: "~571 !1139 !1501"
COMPILER_PATH: "" ADD_PATH: "C:\\msys64\\usr\\bin"
- 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"
@ -114,7 +111,7 @@ environment:
TESTING: ON TESTING: ON
SHARED: OFF SHARED: OFF
DISABLED_TESTS: "!1139 !1501" DISABLED_TESTS: "!1139 !1501"
COMPILER_PATH: "" ADD_PATH: "C:\\msys64\\usr\\bin"
# generated CMake-based MSYS Makefiles builds (mingw cross-compiling) # generated CMake-based MSYS Makefiles builds (mingw cross-compiling)
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
BUILD_SYSTEM: CMake BUILD_SYSTEM: CMake
@ -127,7 +124,7 @@ environment:
TESTING: ON TESTING: ON
SHARED: OFF SHARED: OFF
DISABLED_TESTS: "!1139 !1501" DISABLED_TESTS: "!1139 !1501"
COMPILER_PATH: "C:\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin" 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: "/*" MSYS2_ARG_CONV_EXCL: "/*"
BUILD_OPT: -k BUILD_OPT: -k
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
@ -141,7 +138,7 @@ environment:
TESTING: ON TESTING: ON
SHARED: OFF SHARED: OFF
DISABLED_TESTS: "!1139 !1501" DISABLED_TESTS: "!1139 !1501"
COMPILER_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;C:\\msys64\\usr\\bin"
MSYS2_ARG_CONV_EXCL: "/*" MSYS2_ARG_CONV_EXCL: "/*"
BUILD_OPT: -k BUILD_OPT: -k
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
@ -155,7 +152,7 @@ environment:
TESTING: ON TESTING: ON
SHARED: OFF SHARED: OFF
DISABLED_TESTS: "!1139 !1501" DISABLED_TESTS: "!1139 !1501"
COMPILER_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;C:\\msys64\\usr\\bin"
MSYS2_ARG_CONV_EXCL: "/*" MSYS2_ARG_CONV_EXCL: "/*"
BUILD_OPT: -k BUILD_OPT: -k
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022"
@ -169,7 +166,7 @@ environment:
TESTING: ON TESTING: ON
SHARED: OFF SHARED: OFF
DISABLED_TESTS: "!1139 !1501" DISABLED_TESTS: "!1139 !1501"
COMPILER_PATH: "C:\\MinGW\\bin" ADD_PATH: "C:\\MinGW\\bin;C:\\msys64\\usr\\bin"
MSYS2_ARG_CONV_EXCL: "/*" MSYS2_ARG_CONV_EXCL: "/*"
BUILD_OPT: -k BUILD_OPT: -k
# winbuild-based builds # winbuild-based builds
@ -232,22 +229,24 @@ environment:
BUILD_SYSTEM: autotools BUILD_SYSTEM: autotools
TESTING: ON TESTING: ON
DISABLED_TESTS: "!19 ~1056 !1233" DISABLED_TESTS: "!19 ~1056 !1233"
ADD_PATH: "C:\\msys64\\usr\\bin"
CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --disable-proxy --with-schannel" CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --disable-proxy --with-schannel"
- 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 ~1056 !1233" DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233"
ADD_PATH: "C:\\msys64\\usr\\bin"
CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --with-schannel" CONFIG_ARGS: "--enable-debug --enable-werror --disable-threaded-resolver --with-schannel"
- 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 ~1056 !1233" DISABLED_TESTS: "!19 !504 !704 !705 ~1056 !1233"
ADD_PATH: "C:\\msys64\\usr\\bin"
CONFIG_ARGS: "--enable-warnings --enable-werror --with-schannel" CONFIG_ARGS: "--enable-warnings --enable-werror --with-schannel"
install: install:
- set "PATH=C:\msys64\usr\bin;%PATH%" - if not "%ADD_PATH%"=="" (
- if not "%COMPILER_PATH%"=="" ( set "PATH=%ADD_PATH%;%PATH%" )
set "PATH=%COMPILER_PATH%;%PATH%" )
build_script: build_script:
- if %BUILD_SYSTEM%==CMake ( - if %BUILD_SYSTEM%==CMake (