From: Anatol Belski Date: Wed, 18 Oct 2017 15:47:27 +0000 (+0200) Subject: Merge branch 'PHP-7.1' into PHP-7.2 X-Git-Tag: php-7.2.0RC5~40 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b76520d86f642aa5c5be7ebf6224fba69e4db22;p=php Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Move to php-sdk-2.0.0beta3 for Appveyor --- 2b76520d86f642aa5c5be7ebf6224fba69e4db22 diff --cc .appveyor.yml index 43939011d2,84c93574e6..7830a05aec --- 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.12beta2 + PHP_BUILD_SDK_BRANCH: php-sdk-2.0.12beta3 + PHP_BUILD_CRT: vc15 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root