diff options
| author | Anatol Belski <ab@php.net> | 2017-01-06 01:29:45 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-01-06 01:29:45 +0100 |
| commit | 460247c742e953ef3b009b79204a20efca5274b7 (patch) | |
| tree | b7e626020dabdfc782f799e1d2b4ecb71ef97b69 | |
| parent | e7ce861defc56892869cebe18ae6f6e08242f61f (diff) | |
| parent | 372144508c5abbed46e71e719f462b714139827f (diff) | |
| download | php-git-460247c742e953ef3b009b79204a20efca5274b7.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
don't use separate deps for release branches
| -rw-r--r-- | appveyor/build_task.bat | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat index 5a5afaf66f..550d73f3a4 100644 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@ -17,9 +17,9 @@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" ( set BRANCH=master set STABILITY=staging ) -set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%APPVEYOR_REPO_BRANCH% +set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%BRANCH% rem SDK is cached, deps info is cached as well -echo Updating dependencies +echo Updating dependencies in %DEPS_DIR% call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% if %errorlevel% neq 0 exit /b 3 |