From: Anatol Belski <ab@php.net>
Date: Wed, 12 Jul 2017 13:40:33 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0beta1~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b41d715511bcc24b0fdd57a7c39d852d960c1f88;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Guard against AppVeyor losing deps issue
---

b41d715511bcc24b0fdd57a7c39d852d960c1f88
diff --cc appveyor/build_task.bat
index 6a2bf2dbc0,4136455ab0..1bcbbb7754
--- 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