From: Anatol Belski Date: Sat, 20 May 2017 11:52:35 +0000 (+0200) Subject: Merge branch 'PHP-7.1' X-Git-Tag: php-7.2.0alpha1~57^2~45 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d3027d759fbe4222ff8244754472331d1f40ed7;p=php Merge branch 'PHP-7.1' * PHP-7.1: move to the next sdk version for AppVeyor --- 5d3027d759fbe4222ff8244754472331d1f40ed7 diff --cc .appveyor.yml index 6d2ab3b29f,20942974c7..68f1bdf86a --- 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.3 + PHP_BUILD_SDK_BRANCH: php-sdk-2.0.4 + PHP_BUILD_CRT: vc15 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root