From: Anatol Belski Date: Tue, 20 Feb 2018 14:52:42 +0000 (+0100) Subject: Merge branch 'PHP-7.1' into PHP-7.2 X-Git-Tag: php-7.2.4RC1~57 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=884697a290e6ca72976df74179d37783c1bc8a3f;p=php Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Update binary tools SDK branch for AppVeyor --- 884697a290e6ca72976df74179d37783c1bc8a3f diff --cc .appveyor.yml index 333ab55d76,0009ef2b01..9f6116885b --- 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.0 + PHP_BUILD_SDK_BRANCH: php-sdk-2.1.1 + PHP_BUILD_CRT: vc15 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root