]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Mon, 23 Oct 2017 05:09:52 +0000 (07:09 +0200)
committerAnatol Belski <ab@php.net>
Mon, 23 Oct 2017 05:09:52 +0000 (07:09 +0200)
* PHP-7.1:
  Rename build cache folder and separate sdk
  Revert "Invalidate the whole cache when .appveyor.yml was changed"

1  2 
.appveyor.yml

diff --cc .appveyor.yml
index 5918cd00b79ecb109371bcbeeb85c7c072e22951,800e01093e7dea21f98f0512e9e4187a6880bd6a..a8655de5bb7bdcbb9eb7e0fd6dd92c206cc0946f
@@@ -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