From: Anatol Belski Date: Wed, 26 Apr 2017 15:07:37 +0000 (+0200) Subject: Merge branch 'PHP-7.1' X-Git-Tag: php-7.2.0alpha2~15^2~80 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67b701a60740cf369e64391c481d4b89da339687;p=php Merge branch 'PHP-7.1' * PHP-7.1: sync bin sdk version --- 67b701a60740cf369e64391c481d4b89da339687 diff --cc .appveyor.yml index 6312b7a796,288d06712c..d2c200db18 --- 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.1 + PHP_BUILD_SDK_BRANCH: php-sdk-2.0.2 + PHP_BUILD_CRT: vc15 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root