From: Anatol Belski Date: Wed, 21 Mar 2018 12:17:44 +0000 (+0100) Subject: Merge branch 'PHP-7.1' into PHP-7.2 X-Git-Tag: php-7.2.5RC1~37 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b8861204ef9647965c8f936a9947d467d1416a4;p=php Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Update SDK version for AppVeyor --- 7b8861204ef9647965c8f936a9947d467d1416a4 diff --cc .appveyor.yml index ed6ae6abb1,ce96a8668d..37d92e5ef8 --- 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.2 + PHP_BUILD_SDK_BRANCH: php-sdk-2.1.3beta1 + PHP_BUILD_CRT: vc15 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root