diff options
| author | Anatol Belski <ab@php.net> | 2017-03-23 13:14:17 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-03-23 13:14:17 +0100 |
| commit | 78bacbadfb4277a0b5d41d49e456bca6095433c8 (patch) | |
| tree | 26b33e43e435c823d56780ea76a6d7984704ad4b | |
| parent | 9e3672eaef233c24b1b846971abed19ea8e96f52 (diff) | |
| parent | 1dbef2e27a94e3a81a3079be06659db90509971c (diff) | |
| download | php-git-78bacbadfb4277a0b5d41d49e456bca6095433c8.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
adjust deps dir naming scheme
| -rw-r--r-- | appveyor/build_task.bat | 2 | ||||
| -rw-r--r-- | appveyor/test_task.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat index 550d73f3a4..5b88159d66 100644 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@ -17,7 +17,7 @@ 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%-%BRANCH% +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 --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% diff --git a/appveyor/test_task.bat b/appveyor/test_task.bat index 85e144d10b..9f9e238ed3 100644 --- a/appveyor/test_task.bat +++ b/appveyor/test_task.bat @@ -11,7 +11,7 @@ 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%-%BRANCH% +set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH% rem setup MySQL related exts set MYSQL_PWD=Password12! |