diff options
| author | Anatol Belski <ab@php.net> | 2017-10-30 08:57:29 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-30 08:57:29 +0100 |
| commit | af6ba57d9574dc845fa389cb302587afeb1afa18 (patch) | |
| tree | 801cf3ded46017371018be5a5ccc0f5520b2a390 | |
| parent | 49256dcf6fb746b8df5ad5d6f04f5f5eda0fb85a (diff) | |
| parent | 26eb6c5bab6e9229ade5088662180d213b699fa1 (diff) | |
| download | php-git-af6ba57d9574dc845fa389cb302587afeb1afa18.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
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 |