From: Anatol Belski <ab@php.net>
Date: Sat, 17 Jun 2017 00:00:27 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5aa96fe3d564c4d1c5f321ef91be108037a172fe;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Next round on AppVeyor reliability.
---

5aa96fe3d564c4d1c5f321ef91be108037a172fe
diff --cc appveyor/build_task.bat
index b2f029a145,4b59580cb7..6a2bf2dbc0
--- a/appveyor/build_task.bat
+++ b/appveyor/build_task.bat
@@@ -19,20 -19,21 +19,20 @@@ set STABILITY=stagin
  set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH%
  rem SDK is cached, deps info is cached as well
  echo Updating dependencies in %DEPS_DIR%
- call phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt %PHP_BUILD_CRT%
 -cmd /c phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR%
++cmd /c phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt %PHP_BUILD_CRT%
  if %errorlevel% neq 0 exit /b 3
  
- call buildconf.bat --force
+ cmd /c buildconf.bat --force
  if %errorlevel% neq 0 exit /b 3
  
  if "%THREAD_SAFE%" equ "0" set ADD_CONF=--disable-zts
  
 -set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_odbc,odbc,pdo_firebird,interbase,ldap,imap,dba
 +set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_odbc,odbc,pdo_firebird,interbase,ldap,imap
  if "%OPCACHE%" equ "0" set EXT_EXCLUDE_FROM_TEST=%EXT_EXCLUDE_FROM_TEST%,opcache
  
- call configure.bat ^
+ cmd /c configure.bat ^
  	--enable-snapshot-build ^
  	--disable-debug-pack ^
 -	--with-mcrypt=shared ^
  	--enable-com-dotnet=shared ^
  	--without-analyzer ^
  	--enable-object-out-dir=%PHP_BUILD_OBJ_DIR% ^