From: Anatol Belski <ab@php.net>
Date: Wed, 9 May 2018 09:30:09 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.7RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41aa83f0c254922aedbe4845511c6b2862f4de26;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update SDK version for AppVeyor
  bump versions
---

41aa83f0c254922aedbe4845511c6b2862f4de26
diff --cc .appveyor.yml
index d679513674,5e4a2ae3a4..7e64703f37
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@@ -23,8 -23,7 +23,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.1.3
+         PHP_BUILD_SDK_BRANCH: php-sdk-2.1.5
 +        PHP_BUILD_CRT: vc15
          # ext and env setup for tests
          #MYSQL_TEST_PASSWD: Password12!
          #MYSQL_TEST_USER: root