summaryrefslogtreecommitdiff
path: root/appveyor/build.bat
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-10-30 12:16:53 +0100
committerAnatol Belski <ab@php.net>2017-10-30 12:16:53 +0100
commit7ea44da104309d4ce358022849f45898b4381b02 (patch)
tree56e58d54245732dc9410512b7395b3c08a62ccf4 /appveyor/build.bat
parente305e8fb7aac133095d11b80c10ebec9eeddaae3 (diff)
downloadphp-git-7ea44da104309d4ce358022849f45898b4381b02.tar.gz
Yet one attempt to mitigate the unzip error on AppVeyor
Diffstat (limited to 'appveyor/build.bat')
-rw-r--r--appveyor/build.bat8
1 files changed, 6 insertions, 2 deletions
diff --git a/appveyor/build.bat b/appveyor/build.bat
index 1ad3d96123..c4a21c7faa 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-vc14-%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-vc14-%PLATFORM%.bat
if not exist "%SDK_RUNNER%" (
echo "%SDK_RUNNER%" doesn't exist
exit /b 3