diff options
| author | Anatol Belski <ab@php.net> | 2017-10-30 12:09:15 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-30 12:09:15 +0100 |
| commit | 8be5bb8b101c81db2eabdc96c667374f96369244 (patch) | |
| tree | ed6071c75a30a93665f3e2428be8de7c28c2d20a | |
| parent | ddcef0fc0ffb7bb69fa121146727ba499742cec2 (diff) | |
| parent | c32e53b6419f326759f0d662e823cfe7fdf334cf (diff) | |
| download | php-git-8be5bb8b101c81db2eabdc96c667374f96369244.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Ensure SDK is checked out before asking for version
| -rw-r--r-- | appveyor/build.bat | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/appveyor/build.bat b/appveyor/build.bat index 5eb01cf1b6..94cb278033 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -13,19 +13,19 @@ 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 ( - 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% - echo Fetching remote SDK repository - git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" fetch --prune origin 2>&1 - echo Checkout SDK repository branch - git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" checkout --force %SDK_BRANCH% - ) +) + +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% + echo Fetching remote SDK repository + git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" fetch --prune origin 2>&1 + echo Checkout SDK repository branch + 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-%PHP_BUILD_CRT%-%PLATFORM%.bat |