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

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Rename build cache folder and separate sdk
  Revert "Invalidate the whole cache when .appveyor.yml was changed"
---

bba881e4243278a6fdec07beecdaffea92b5f7ab
diff --cc .appveyor.yml
index 5918cd00b7,800e01093e..a8655de5bb
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@@ -17,14 -17,14 +17,15 @@@ skip_commits
  clone_depth: 64
  
  cache:
-         - c:\build-cache -> .appveyor.yml
+         - c:\build-cache2
+         - c:\build-cache2-sdk -> .appveyor.yml
  
  environment:
-         PHP_BUILD_CACHE_BASE_DIR: c:\build-cache  
+         PHP_BUILD_CACHE_BASE_DIR: c:\build-cache2
          PHP_BUILD_OBJ_DIR: c:\obj
-         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
+         PHP_BUILD_CACHE_SDK_DIR: c:\build-cache2-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