com php-src: Merge branch 'PHP-7.1': .appveyor.yml appveyor/bui ld_task.bat
[email protected] (Anatol Belski)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: eb68c0d525f21fd2f81e2c0833a75cc30df095ce Author: Anatol Belski <[email protected]> Mon, 24 Apr 2017 22:14:30 +0200 Parents: dca2a855c84b89b4f1fce5586662ff465598ab45 44fdae4360b44df8150d14c032454c88c44da87d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eb68c0d525f21fd2f81e2c0833a75cc30df095ce Log: Merge branch 'PHP-7.1' * PHP-7.1: don't backup older deps after upgrades update SDK version for AppVeyor Changed paths: MM .appveyor.yml MM appveyor/build_task.bat Diff: diff --cc .appveyor.yml index 89c3fbf,581399d..6312b7a --- 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.0 + PHP_BUILD_SDK_BRANCH: php-sdk-2.0.1 + PHP_BUILD_CRT: vc15 # ext and env setup for tests #MYSQL_TEST_PASSWD: Password12! #MYSQL_TEST_USER: root diff --cc appveyor/build_task.bat index 6b49d24,ad3fbcd..fc58929 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@@ -19,7 -19,7 +19,7 @@@ set STABILITY=stagin set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VC%-%PHP_SDK_ARCH% rem SDK is cached, deps info is cached as well echo Updating dependencies in %DEPS_DIR% - call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt %PHP_BUILD_CRT% -call phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% ++call phpsdk_deps --update --no-backup --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt %PHP_BUILD_CRT% if %errorlevel% neq 0 exit /b 3 call buildconf.bat --force