From: Anatol Belski Date: Fri, 2 Feb 2018 13:09:20 +0000 (+0100) Subject: Merge branch 'PHP-7.1' into PHP-7.2 X-Git-Tag: php-7.2.3RC1~22 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7575758a91c4c0609c2085363065e6d17d1de9d;p=php Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Switch to the new PHP SDK version on AppVeyor --- b7575758a91c4c0609c2085363065e6d17d1de9d diff --cc .appveyor.yml index 8b7b69aa1b,c380424a93..333ab55d76 --- 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.0.13 + PHP_BUILD_SDK_BRANCH: php-sdk-2.1.0 + PHP_BUILD_CRT: vc15 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root