summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-10-30 11:29:40 +0100
committerAnatol Belski <ab@php.net>2017-10-30 11:29:40 +0100
commitdfadda3d090eb3bea5df62a17e8fdd5f998d7ab3 (patch)
tree7a2cb357276a095ae94e27f62bb37b0b01e79e95
parent6336c4f629a173c7a343dc5dcac7e68e3d6e8668 (diff)
parent7bf2947016dc840fcc2dcef8ef4f2003f00f7aef (diff)
downloadphp-git-dfadda3d090eb3bea5df62a17e8fdd5f998d7ab3.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fix fetching the SDK version
-rw-r--r--appveyor/build.bat2
1 files changed, 1 insertions, 1 deletions
diff --git a/appveyor/build.bat b/appveyor/build.bat
index 8119c097f4..e18b9a3dbb 100644
--- a/appveyor/build.bat
+++ b/appveyor/build.bat
@@ -13,11 +13,11 @@ if not exist "%PHP_BUILD_OBJ_DIR%" (
mkdir "%PHP_BUILD_OBJ_DIR%"
)
+for /f "tokens=*" %%a in ('type %PHP_BUILD_CACHE_SDK_DIR%\VERSION') do set GOT_SDK_VER=%%a
if not exist "%PHP_BUILD_CACHE_SDK_DIR%" (
echo Cloning remote SDK repository
git clone --branch %SDK_BRANCH% %SDK_REMOTE% "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1
) else (
- for /f "tokens=*" %%a in ('type %PHP_BUILD_CACHE_SDK_DIR%\VERSION') do set GOT_SDK_VER=%%a
echo Got SDK version %GOT_SDK_VER%
if NOT "%GOT_SDK_VER%" == "%PHP_BUILD_SDK_BRANCH:~8%" (
echo Updating to the configured SDK version %SDK_BRANCH:~8%