diff options
| author | Anatol Belski <ab@php.net> | 2017-10-30 12:20:24 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-30 12:20:24 +0100 |
| commit | f10d8c21ab3cfdb26ad261d002eba19206efff6c (patch) | |
| tree | 79ee2d33cdf4960acbda586a0f4ac9bf9af98a5a /appveyor | |
| parent | 8be5bb8b101c81db2eabdc96c667374f96369244 (diff) | |
| parent | a2cd2965d72290d24e1bb3906834662fd1be45d7 (diff) | |
| download | php-git-f10d8c21ab3cfdb26ad261d002eba19206efff6c.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Yet one attempt to mitigate the unzip error on AppVeyor
Diffstat (limited to 'appveyor')
| -rw-r--r-- | appveyor/build.bat | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/appveyor/build.bat b/appveyor/build.bat index 94cb278033..dfef616164 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -2,6 +2,7 @@ set SDK_REMOTE=https://github.com/OSTC/php-sdk-binary-tools.git set SDK_BRANCH=%PHP_BUILD_SDK_BRANCH% +set SDK_RUNNER=%PHP_BUILD_CACHE_SDK_DIR%\phpsdk-%PHP_BUILD_CRT%-%PLATFORM%.bat if not exist "%PHP_BUILD_CACHE_BASE_DIR%" ( echo Creating %PHP_BUILD_CACHE_BASE_DIR% @@ -13,6 +14,10 @@ if not exist "%PHP_BUILD_OBJ_DIR%" ( mkdir "%PHP_BUILD_OBJ_DIR%" ) +if not exist "%SDK_RUNNER%" ( + if exist "%PHP_BUILD_CACHE_SDK_DIR%" rmdir /s /q "%PHP_BUILD_CACHE_SDK_DIR%" +) + 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 @@ -21,14 +26,13 @@ if not exist "%PHP_BUILD_CACHE_SDK_DIR%" ( 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 Switching 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 if not exist "%SDK_RUNNER%" ( echo "%SDK_RUNNER%" doesn't exist exit /b 3 |