diff options
| author | Anatol Belski <ab@php.net> | 2017-10-30 10:16:39 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-30 10:16:39 +0100 |
| commit | f361caa5c09cc42a1bf2b30cbf616bff70afe8f4 (patch) | |
| tree | ab971e174b6f561bb8818770c55e6010364d341c | |
| parent | 26eb6c5bab6e9229ade5088662180d213b699fa1 (diff) | |
| parent | bc410c2609adb6141aced2b52e6c7aa91a5d5b2d (diff) | |
| download | php-git-f361caa5c09cc42a1bf2b30cbf616bff70afe8f4.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove status check on the SDK repo and add version check
| -rw-r--r-- | appveyor/build.bat | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/appveyor/build.bat b/appveyor/build.bat index a27abc2660..22c617f11c 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -17,12 +17,8 @@ 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 ( - git --git-dir="%PHP_BUILD_CACHE_SDK_DIR%\.git" --work-tree="%PHP_BUILD_CACHE_SDK_DIR%" status 2>&1 - if %errorlevel% neq 0 ( - rmdir /s /q "%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 + if "%GOT_SDK_VER%" NEQ "%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 |