diff options
| author | Anatol Belski <ab@php.net> | 2017-10-30 08:56:52 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-30 08:56:52 +0100 |
| commit | 26eb6c5bab6e9229ade5088662180d213b699fa1 (patch) | |
| tree | 12c6bfd876de21ef21706c0e17452fa676af314d | |
| parent | 230e505fd8decde99af720fd640e70aaa297b5e2 (diff) | |
| parent | 741efa78074388c9aebf9be9789b68fe0ab3ec24 (diff) | |
| download | php-git-26eb6c5bab6e9229ade5088662180d213b699fa1.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Catch with the latest AppVeyor unzip errors
| -rw-r--r-- | appveyor/build.bat | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/appveyor/build.bat b/appveyor/build.bat index 31081bbe06..a27abc2660 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -17,10 +17,17 @@ 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 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% + 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 ( + 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-vc14-%PLATFORM%.bat |