diff options
| author | Anatol Belski <ab@php.net> | 2017-07-12 15:40:00 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-12 15:40:00 +0200 |
| commit | 91aad4bc8104b6b96d3985d38d41e253beb36192 (patch) | |
| tree | 4a8c6c3c14c07097b92a357edb23fa42e53f89f8 | |
| parent | 8b04e89ef0100932a451870b84666a36fa2fa43f (diff) | |
| parent | 2f606dc5e8173ffdfd9086c45dffeeababf478ce (diff) | |
| download | php-git-91aad4bc8104b6b96d3985d38d41e253beb36192.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Guard against AppVeyor losing deps issue
| -rw-r--r-- | appveyor/build_task.bat | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat index 4b59580cb7..4136455ab0 100644 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@ -22,6 +22,13 @@ echo Updating dependencies in %DEPS_DIR% cmd /c phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% 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 |