diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-10-30 12:05:45 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-10-30 12:05:45 +0300 |
| commit | e4a8b7a4b6f29fbaf18b6c4695b52114dff4b60c (patch) | |
| tree | 181c2596c106a3691d22a2c8a0f74ec4f4abdc57 | |
| parent | 2065d51a18e3aa4e08ff806b5a8994fd4ad05746 (diff) | |
| parent | e36731dc9593ce6141c5f73cc66194bc8800e5a4 (diff) | |
| download | php-git-e4a8b7a4b6f29fbaf18b6c4695b52114dff4b60c.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
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 8141face82..e1d5291aaa 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-%PHP_BUILD_CRT%-%PLATFORM%.bat |