From: Anatol Belski Date: Thu, 20 Jul 2017 20:08:39 +0000 (+0200) Subject: Merge branch 'PHP-7.1' into PHP-7.2 X-Git-Tag: php-7.2.0beta2~92 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8eb110cd5b1e862429d893c1acd6dc9959c8e01;p=php Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: increment sdk version --- b8eb110cd5b1e862429d893c1acd6dc9959c8e01 diff --cc .appveyor.yml index 5fc0348420,fed3d7f837..1a72b8465d --- 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.7 + PHP_BUILD_SDK_BRANCH: php-sdk-2.0.8 + PHP_BUILD_CRT: vc15 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root