com php-src: switch AppVeyor to vc15 for master: .appveyor.yml appveyor/build.bat appveyor/build_task.bat appveyor/test .bat
| From: | Anatol Belski | Date: | Thu, 23 Mar 2017 11:38:52 +0000 |
| Subject: | com php-src: switch AppVeyor to vc15 for master: .appveyor.yml appveyor/build.bat appveyor/build_task.bat appveyor/test .bat | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-97376@lists.php.net to get a copy of this message | ||
Commit: 4f8b410b06d99326d6767da1bb2f92fbd821cd45
Author: Anatol Belski <ab@php.net> Thu, 23 Mar 2017 12:37:49 +0100
Parents: a7f2dbf831c348fb208e0d83f7c5efc7f144ea19
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4f8b410b06d99326d6767da1bb2f92fbd821cd45
Log:
switch AppVeyor to vc15 for master
Changed paths:
M .appveyor.yml
M appveyor/build.bat
M appveyor/build_task.bat
M appveyor/test.bat
Diff:
diff --git a/.appveyor.yml b/.appveyor.yml
index 5708cfd..221dc65 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,7 +1,7 @@
version: "{branch}.build.{build}"
-image: Visual Studio 2015
+image: Visual Studio 2017
branches:
except:
diff --git a/appveyor/build.bat b/appveyor/build.bat
index c5ae57a..357fecf 100644
--- a/appveyor/build.bat
+++ b/appveyor/build.bat
@@ -23,7 +23,7 @@ if not exist "%PHP_BUILD_CACHE_SDK_DIR%" (
git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git"
--work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH%
)
-set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-vc14-%PLATFORM%.bat
+set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-vc15-%PLATFORM%.bat
if not exist "%SDK_RUNNER%" (
echo "%SDK_RUNNER%" doesn't exist
exit /b 3
diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat
index a76b81b..1f5485e 100644
--- a/appveyor/build_task.bat
+++ b/appveyor/build_task.bat
@@ -20,7 +20,7 @@ if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%BRANCH%
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 vc14
+call phpsdk_deps --update --branch %BRANCH% --stability %STABILITY% --deps %DEPS_DIR% --crt vc15
if %errorlevel% neq 0 exit /b 3
call buildconf.bat --force
diff --git a/appveyor/test.bat b/appveyor/test.bat
index fbe24ec..8fb039d 100644
--- a/appveyor/test.bat
+++ b/appveyor/test.bat
@@ -1,6 +1,6 @@
@echo off
-set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-vc14-%PLATFORM%.bat
+set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-vc15-%PLATFORM%.bat
if not exist "%SDK_RUNNER%" (
echo "%SDK_RUNNER%" doesn't exist
exit /b 3