From 591e811a3520d96e185173d80cb73176f162097a Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 30 Oct 2017 10:34:11 +0100 Subject: [PATCH 1/2] Don't use the cache dependency, SDK version is handled in script --- .appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index e55c2adab27..d1c5c0f448a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,7 +18,6 @@ clone_depth: 64 cache: - c:\build-cache - - c:\build-cache\sdk -> .appveyor.yml environment: PHP_BUILD_CACHE_BASE_DIR: c:\build-cache From c6e8c2bc9fe107254b01f3d24ce23e521579decf Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 30 Oct 2017 10:53:12 +0100 Subject: [PATCH 2/2] Fix SDK version comparison and add more verbosity --- appveyor/build.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor/build.bat b/appveyor/build.bat index 22c617f11c2..8119c097f45 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -18,7 +18,9 @@ if not exist "%PHP_BUILD_CACHE_SDK_DIR%" ( git clone --branch %SDK_BRANCH% %SDK_REMOTE% "%PHP_BUILD_CACHE_SDK_DIR%" 2>&1 ) else ( for /f "tokens=*" %%a in ('type %PHP_BUILD_CACHE_SDK_DIR%\VERSION') do set GOT_SDK_VER=%%a - if "%GOT_SDK_VER%" NEQ "%SDK_BRANCH:~8%" ( + 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 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