summaryrefslogtreecommitdiff
path: root/appveyor
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-03-23 13:15:30 +0100
committerAnatol Belski <ab@php.net>2017-03-23 13:15:30 +0100
commitced36f9b2e85587e9a433b5d60a6d9fb9044a83f (patch)
tree548f5a2a98e62729bcc11413b0b087afccbeffbb /appveyor
parent4f8b410b06d99326d6767da1bb2f92fbd821cd45 (diff)
parent78bacbadfb4277a0b5d41d49e456bca6095433c8 (diff)
downloadphp-git-ced36f9b2e85587e9a433b5d60a6d9fb9044a83f.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: adjust deps dir naming scheme
Diffstat (limited to 'appveyor')
-rw-r--r--appveyor/build_task.bat2
-rw-r--r--appveyor/test_task.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat
index 1f5485e8bd..5ed7117462 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% --crt vc15
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!