Browse Source

Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
pull/2887/merge
Xinchen Hui 9 years ago
parent
commit
039263c884
  1. 1
      .appveyor.yml
  2. 4
      appveyor/build.bat

1
.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

4
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

Loading…
Cancel
Save