From 60cec85638c17b1025f1be6ccb8ceba2d75fddb1 Mon Sep 17 00:00:00 2001
From: Rangi42 <sylvie.oukaour+rangi42@gmail.com>
Date: Thu, 17 Jul 2025 21:47:45 -0400
Subject: [PATCH] Use separate caches for zlib and libpng on Windows 2022 vs
 2025

Windows 2025 no longer has a D:/ drive
<https://github.com/actions/runner-images/issues/12416>
which affects where the cached files go.

This can result in one of two errors in the "Install zlib" step
after restoring from cache:

- file cannot create directory: D:/a/rgbds/rgbds/install_dir/lib.
  Maybe need administrative privileges.
- file INSTALL cannot find "C:/a/rgbds/rgbds/zbuild/Release/zlib1.dll":
  File exists.

Separate caches per OS should solve this problem.
---
 .github/workflows/testing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 4245b54f..f5af2406 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -149,7 +149,7 @@ jobs:
           path: |
             zbuild
             pngbuild
-          key: ${{ matrix.arch }}-${{ hashFiles('zlib/**', 'libpng/**') }}
+          key: ${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles('zlib/**', 'libpng/**') }}
       - name: Build zlib
         if: steps.cache.outputs.cache-hit != 'true'
         shell: bash