From: Anatol Belski <ab@php.net>
Date: Mon, 24 Apr 2017 20:14:30 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb68c0d525f21fd2f81e2c0833a75cc30df095ce;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  don't backup older deps after upgrades
  update SDK version for AppVeyor
---

eb68c0d525f21fd2f81e2c0833a75cc30df095ce
diff --cc .appveyor.yml
index 89c3fbf54f,581399d067..6312b7a796
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@@ -24,8 -24,7 +24,8 @@@ 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
 +        PHP_BUILD_CRT: vc15
          # ext and env setup for tests
          #MYSQL_TEST_PASSWD: Password12!
          #MYSQL_TEST_USER: root
diff --cc appveyor/build_task.bat
index 6b49d244d7,ad3fbcdfa3..fc58929347
--- a/appveyor/build_task.bat
+++ b/appveyor/build_task.bat
@@@ -19,7 -19,7 +19,7 @@@ set STABILITY=stagin
  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 %PHP_BUILD_CRT%
 -call phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR%
++call phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt %PHP_BUILD_CRT%
  if %errorlevel% neq 0 exit /b 3
  
  call buildconf.bat --force