From 4cf4ba47af4e29482b9fa1b5e2306df813e3b03b Mon Sep 17 00:00:00 2001
From: Jean-Philip Desjardins <jean-philip.desjardins@polymtl.ca>
Date: Mon, 28 Nov 2022 08:22:51 -0500
Subject: [PATCH] CI: Apply workaround for
 https://github.com/actions/runner-images/issues/6627.

---
 .github/workflows/build-windows.yaml     | 3 ++-
 .github/workflows/build-windows_psf.yaml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml
index 8ee521ceee..96e80f9e4b 100644
--- a/.github/workflows/build-windows.yaml
+++ b/.github/workflows/build-windows.yaml
@@ -67,10 +67,11 @@ jobs:
       env:
         LONG_HASH: ${{ github.sha }}
     - name: Generate CMake Project
+      #Apply workaround for https://github.com/actions/runner-images/issues/6627, remove when it's fixed
       run: |
         mkdir build
         cd build
-        cmake .. -G"${{ matrix.build-type }}" -A ${{ matrix.target-platform }} -T v141_xp -DUSE_QT=on -DBUILD_LIBRETRO_CORE=yes
+        cmake .. -G"${{ matrix.build-type }}" -A ${{ matrix.target-platform }} -T v141_xp -DUSE_QT=on -DBUILD_LIBRETRO_CORE=yes -DCMAKE_IGNORE_PATH=C:/Strawberry/perl/bin;C:/Strawberry/c/lib
     - name: Build
       run: |
         cd build
diff --git a/.github/workflows/build-windows_psf.yaml b/.github/workflows/build-windows_psf.yaml
index fbdc898bdf..9b35fbd452 100644
--- a/.github/workflows/build-windows_psf.yaml
+++ b/.github/workflows/build-windows_psf.yaml
@@ -48,10 +48,11 @@ jobs:
       env:
         LONG_HASH: ${{ github.sha }}
     - name: Generate CMake Project
+      #Apply workaround for https://github.com/actions/runner-images/issues/6627, remove when it's fixed
       run: |
         mkdir build
         cd build
-        cmake .. -G"${{ matrix.build-type }}" -A ${{ matrix.target-platform }} -T v141_xp -DBUILD_PLAY=off -DBUILD_TESTS=off -DBUILD_PSFPLAYER=on -DBUILD_AOT_CACHE=${{ matrix.aot-build }}
+        cmake .. -G"${{ matrix.build-type }}" -A ${{ matrix.target-platform }} -T v141_xp -DBUILD_PLAY=off -DBUILD_TESTS=off -DBUILD_PSFPLAYER=on -DBUILD_AOT_CACHE=${{ matrix.aot-build }} -DCMAKE_IGNORE_PATH=C:/Strawberry/perl/bin;C:/Strawberry/c/lib
       env:
         DXSDK_DIR: '${{ github.workspace }}\DX_SDK'
     - name: Build