From: Anatol Belski <ab@php.net>
Date: Wed, 11 Oct 2017 18:31:58 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC5~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7aebcc186aa3956c5c0e56f2f9141a73a635623;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Put php-sdk-2.0.12beta1 for AppVeyor
---

e7aebcc186aa3956c5c0e56f2f9141a73a635623
diff --cc .appveyor.yml
index 07b43e64d1,bd4bb4ec0b..a1d0419d31
--- 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.11
+         PHP_BUILD_SDK_BRANCH: php-sdk-2.0.12beta1
 +        PHP_BUILD_CRT: vc15
          # ext and env setup for tests
          #MYSQL_TEST_PASSWD: Password12!
          #MYSQL_TEST_USER: root