From a7a56293aad9427720fc72b86220dd65a79f6778 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 7 Apr 2019 03:54:22 +0200
Subject: CI/AppVeyor: per-compiler deps cache #9852

The deps cache does not work for MSVC builds because the MINGW builds
ovewrite it.  Cache saves 10+ minutes on the build.
---
 ci/build.ps1 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'ci')

diff --git a/ci/build.ps1 b/ci/build.ps1
index 1ba3fa8a6b..88eb02a3f4 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -6,12 +6,15 @@ $compiler = $Matches.compiler
 $compileOption = $Matches.option
 $bits = $Matches.bits
 $cmakeBuildType = 'RelWithDebInfo'
+$depsDir = [System.IO.Path]::GetFullPath("deps-$($compiler)")
 $depsCmakeVars = @{
   CMAKE_BUILD_TYPE = $cmakeBuildType;
 }
 $nvimCmakeVars = @{
   CMAKE_BUILD_TYPE = $cmakeBuildType;
   BUSTED_OUTPUT_TYPE = 'nvim';
+  DEPS_BUILD_DIR=$depsDir;
+  DEPS_PREFIX="$($depsDir)/usr";
 }
 $uploadToCodeCov = $false
 
@@ -89,10 +92,10 @@ function convertToCmakeArgs($vars) {
   return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
 }
 
-if (-Not (Test-Path -PathType container .deps)) {
-  mkdir .deps
+if (-Not (Test-Path -PathType container $depsDir)) {
+  mkdir "$depsDir"
 }
-cd .deps
+cd "$depsDir"
 cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) ..\third-party\ ; exitIfFailed
 cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
 cd ..
-- 
cgit