diff options
| author | Anatol Belski <ab@php.net> | 2017-04-24 22:12:26 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-04-24 22:12:26 +0200 |
| commit | 44fdae4360b44df8150d14c032454c88c44da87d (patch) | |
| tree | baed23d043fbc1fe9cadbddba3e65b9540690612 | |
| parent | 7260f65c62477b6127d2b787ceea88b13d171539 (diff) | |
| parent | 6afcd6c86abc59719aad286bab29ee51508eba9c (diff) | |
| download | php-git-44fdae4360b44df8150d14c032454c88c44da87d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
don't backup older deps after upgrades
update SDK version for AppVeyor
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | appveyor/build_task.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index e1cdd6739c..581399d067 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,7 +24,7 @@ environment: PHP_BUILD_CACHE_BASE_DIR: c:\build-cache PHP_BUILD_OBJ_DIR: c:\obj PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk - PHP_BUILD_SDK_BRANCH: php-sdk-2.0.0 + PHP_BUILD_SDK_BRANCH: php-sdk-2.0.1 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat index a2fae9977e..ad3fbcdfa3 100644 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@ -19,7 +19,7 @@ set STABILITY=staging 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% +call phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% if %errorlevel% neq 0 exit /b 3 call buildconf.bat --force |