From 081037af6d7e88d65df2d0e702ff33c67c27ca4f Mon Sep 17 00:00:00 2001
From: Egor Tensin <egor@tensin.name>
Date: Mon, 29 Dec 2025 15:57:41 +0100
Subject: workflows/test: fix root directory path

---
 action.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/action.yml b/action.yml
index 964ef40..cb41907 100644
--- a/action.yml
+++ b/action.yml
@@ -112,11 +112,6 @@ runs:
             $mingw64 = 'mingw64'
             $mingw = if ($x64) { $mingw64 } else { $mingw32 }
 
-            $mingw_install = Join-Path C: ProgramData chocolatey lib mingw tools install
-            $mingw_root = Join-Path $mingw_install $mingw
-            $mingw_bin = Join-Path $mingw_root bin
-            $mingw_lib = Join-Path $mingw_root $prefix lib
-
             $pkg = 'mingw'
 
             if ($x64) {
@@ -136,6 +131,19 @@ runs:
                     Install-Package $pkg --x86
                 }
             }
+
+            $mingw_install_new = Join-Path C: ProgramData mingw64 $mingw
+            $mingw_install_old = Join-Path C: ProgramData chocolatey lib mingw tools install
+
+            if (Test-Path $mingw_install_new) {
+                $mingw_install = $mingw_install_new
+            } elseif (Test-Path $mingw_install_old) {
+                $mingw_install = Join-Path $mingw_install_old $mingw
+            } else {
+                throw "Where was MinGW installed? Not sure"
+            }
+
+            $mingw_bin = Join-Path $mingw_install bin
             echo $mingw_bin >> $env:GITHUB_PATH
         } else {
             throw "Sorry, installing MinGW is unsupported on $os"
-- 
cgit v1.3