diff --git a/appveyor.yml b/appveyor.yml index 89852099c..e1f3ba6e4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,8 +37,8 @@ services: platform: - - Win32 - x64 + - Win32 # ------------------------------------------------------------------------------------------- # building debug configuration doubles the round time and isn't so useful. @@ -104,7 +104,7 @@ matrix: install: - C:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P openssl-devel -P libiodbc-devel -P libiodbc2 -P odbc-mysql -P odbc-pgsql -P odbc-sqlite3 -P libmysqlclient-devel -P libsqlite3-devel -# - C:\cygwin64\setup-x86_64.exe -B -q -n -N -d -l C:/cygwin64/var/cache/setup -R c:\cygwin64 -s http://cygwin.mirror.constant.com -P openssl-devel + - C:\cygwin64\setup-x86_64.exe -B -q -n -N -d -l C:/cygwin64/var/cache/setup -R c:\cygwin64 -s http://cygwin.mirror.constant.com -P openssl-devel - set POCO_BASE=%CD% - set PATH=C:\ProgramData\chocolatey\bin;%PATH% @@ -374,9 +374,8 @@ build_script: - ps: | if (($env:builder -eq "cygwin") -and ($env:platform -eq "Win32")) { - $cmd = 'C:\cygwin\bin\bash.exe -c "ls -l /usr/include/openssl/"';iex "& $cmd" - $cmd = 'C:\cygwin\bin\bash.exe configure --everything';iex "& $cmd" - $cmd = 'make -s -j4';iex "& $cmd" + $cmd = 'bash.exe configure --everything';iex "& $cmd" + $cmd = 'make.exe -s -j4';iex "& $cmd" } if ($env:builder -eq "msbuild") { @@ -452,7 +451,7 @@ test_script: if (($env:builder -eq "cygwin") -and ($env:platform -eq "Win32")) { $cmd = 'C:\cygwin\usr\sbin\cygserver.exe "&"';iex "& $cmd" - $cmd = 'C:\cygwin\bin\bash.exe -c "appveyor/Cygwin/runtests.sh"';iex "& $cmd" + $cmd = 'bash.exe -c "appveyor/Cygwin/runtests.sh"';iex "& $cmd" } if ($env:builder -eq "msbuild" -and $env:linkmode -eq "shared") {