From 54e22105b87766ec806e16406599476865b5789f Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Fri, 4 Nov 2022 05:52:27 +0000
Subject: [PATCH] CI: cache more in Windows build

---
 .cirrus.yml                    | 5 ++---
 contrib/build-wine/make_win.sh | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 168dbab52..912ecade4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -159,15 +159,14 @@ task:
       - find contrib/deterministic-build/*.txt -type f -print0 | sort -z | xargs -0 sha256sum | sha256sum
       - find contrib/build-wine/ -type f -print0 | sort -z | xargs -0 sha256sum | sha256sum
     populate_script: mkdir -p contrib/build-wine/.cache/win32/wine_pip_cache
-  dll_cache:
-    folder: contrib/build-wine/.cache/win32/dlls
+  build2_cache:
+    folder: contrib/build-wine/.cache/win32/build
     fingerprint_script:
       - echo $CIRRUS_TASK_NAME
       - cat contrib/make_libsecp256k1.sh | sha256sum
       - cat contrib/make_libusb.sh | sha256sum
       - cat contrib/make_zbar.sh | sha256sum
       - find contrib/build-wine/ -type f -print0 | sort -z | xargs -0 sha256sum | sha256sum
-    populate_script: mkdir -p contrib/build-wine/.cache/win32/dlls
   build_script:
     - cd contrib/build-wine
     - ./make_win.sh
diff --git a/contrib/build-wine/make_win.sh b/contrib/build-wine/make_win.sh
index d38f41d56..92a712cc8 100755
--- a/contrib/build-wine/make_win.sh
+++ b/contrib/build-wine/make_win.sh
@@ -23,8 +23,8 @@ export GCC_STRIP_BINARIES="1"
 
 export CONTRIB="$here/.."
 export PROJECT_ROOT="$CONTRIB/.."
-export CACHEDIR="$here/.cache/$WIN_ARCH"
-export PIP_CACHE_DIR="$CACHEDIR/wine_pip_cache"
+export CACHEDIR="$here/.cache/$WIN_ARCH/build"
+export PIP_CACHE_DIR="$here/.cache/$WIN_ARCH/wine_pip_cache"
 export WINE_PIP_CACHE_DIR="c:/electrum/contrib/build-wine/.cache/$WIN_ARCH/wine_pip_cache"
 export DLL_TARGET_DIR="$CACHEDIR/dlls"