com php-src: Merge branch 'PHP-7.1': appveyor/build_task.ba t

Commit: b41d715511bcc24b0fdd57a7c39d852d960c1f88 Author: Anatol Belski <ab@php.net> Wed, 12 Jul 2017 15:40:33 +0200 Parents: bfa3df004819dc2cb3e2d09ebb00f7cb3918de50 91aad4bc8104b6b96d3985d38d41e253beb36192 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b41d715511bcc24b0fdd57a7c39d852d960c1f88 Log: Merge branch 'PHP-7.1' * PHP-7.1: Guard against AppVeyor losing deps issue Changed paths: MM appveyor/build_task.bat Diff: diff --cc appveyor/build_task.bat index 6a2bf2d,4136455..1bcbbb7 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@@ -19,9 -19,16 +19,16 @@@ 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% -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 + rem Something went wrong, most likely when concurrent builds were to fetch deps + rem updates. It might be, that some locking mechanism is needed. + if not exist "%DEPS_DIR%" ( + cmd /c phpsdk_deps --update --force --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% + ) + if %errorlevel% neq 0 exit /b 3 + cmd /c buildconf.bat --force if %errorlevel% neq 0 exit /b 3