diff options
| author | Anatol Belski <ab@php.net> | 2017-10-30 11:16:33 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-30 11:16:33 +0100 |
| commit | a438a633e939d1e717a88d25c6dd9bf49dd50c8e (patch) | |
| tree | 6625c827300f604202764d56a8713e259029ff20 | |
| parent | e5179054fb073c541dc05fd95742fcffe40f11d1 (diff) | |
| parent | bba09a53f4a1106848989a5a84ef22b2a3354dcc (diff) | |
| download | php-git-a438a633e939d1e717a88d25c6dd9bf49dd50c8e.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix SDK version comparison and add more verbosity
Don't use the cache dependency, SDK version is handled in script
| -rw-r--r-- | .appveyor.yml | 1 | ||||
| -rw-r--r-- | appveyor/build.bat | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index bfb45e5e9a..f7e1c5c0e6 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 diff --git a/appveyor/build.bat b/appveyor/build.bat index 417340a335..9971d781ab 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 |