From: Anatol Belski <ab@php.net>
Date: Mon, 23 Oct 2017 05:14:14 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC5~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f3568574452ff2a567556b7aae9f10a11c2e2b3;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Renaming cache folder is not a solution, too. Disable cache for now.
  Revert "Rename build cache folder and separate sdk"
---

8f3568574452ff2a567556b7aae9f10a11c2e2b3
diff --cc .appveyor.yml
index a8655de5bb,be60c2f83a..cfa751b68a
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@@ -16,16 -16,15 +16,16 @@@ skip_commits
  
  clone_depth: 64
  
- cache:
-         - c:\build-cache2
-         - c:\build-cache2-sdk -> .appveyor.yml
+ #cache:
+ #        - c:\build-cache
+ #        - c:\build-cache\sdk -> .appveyor.yml
  
  environment:
-         PHP_BUILD_CACHE_BASE_DIR: c:\build-cache2
+         PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
          PHP_BUILD_OBJ_DIR: c:\obj
-         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache2-sdk
+         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
          PHP_BUILD_SDK_BRANCH: php-sdk-2.0.12beta3
 +        PHP_BUILD_CRT: vc15
          # ext and env setup for tests
          #MYSQL_TEST_PASSWD: Password12!
          #MYSQL_TEST_USER: root