aminya
diff --git a/‎dist/legacy/setup-cpp.js
Copy file name to clipboardExpand all lines: dist/legacy/setup-cpp.js
+1-1Lines changed: 1 addition & 1 deletion b/‎dist/legacy/setup-cpp.js
Copy file name to clipboardExpand all lines: dist/legacy/setup-cpp.js
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/legacy/setup-cpp.js.map
Copy file name to clipboardExpand all lines: dist/legacy/setup-cpp.js.map
+1-1Lines changed: 1 addition & 1 deletion b/‎dist/legacy/setup-cpp.js.map
Copy file name to clipboardExpand all lines: dist/legacy/setup-cpp.js.map
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/modern/setup-cpp.mjs
Copy file name to clipboardExpand all lines: dist/modern/setup-cpp.mjs
+1-1Lines changed: 1 addition & 1 deletion b/‎dist/modern/setup-cpp.mjs
Copy file name to clipboardExpand all lines: dist/modern/setup-cpp.mjs
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/modern/setup-cpp.mjs.map
Copy file name to clipboardExpand all lines: dist/modern/setup-cpp.mjs.map
+1-1Lines changed: 1 addition & 1 deletion b/‎dist/modern/setup-cpp.mjs.map
Copy file name to clipboardExpand all lines: dist/modern/setup-cpp.mjs.map
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/git/git.ts
Copy file name to clipboardExpand all lines: src/git/git.ts
+21-2Lines changed: 21 additions & 2 deletions b/‎src/git/git.ts
Copy file name to clipboardExpand all lines: src/git/git.ts
+21-2Lines changed: 21 additions & 2 deletions
@@ -1,3 +1,5 @@
+import { existsSync } from "fs"
+import { warning } from "ci-log"
 import { addPath } from "envosman"
 import { installAptPack } from "setup-apt"
 import { installBrewPack } from "setup-brew"
@@ -14,8 +16,10 @@ export async function setupGit(version: string, _setupDir: string, _arch: string
   switch (process.platform) {
     case "win32": {
       const result = await setupChocoPack("git", version)
-      result.binDir = "C:/Program Files (x86)/Git/bin"
-      await addPath(result.binDir, rcOptions)
+      const gitDir = findWindowsGit()
+      if (gitDir !== null) {
+        await addPath(gitDir, rcOptions)
+      }
       return result
     }
     case "darwin": {
@@ -36,3 +40,18 @@ export async function setupGit(version: string, _setupDir: string, _arch: string
     }
   }
 }
+
+function findWindowsGit() {
+  const candidates = [
+    "C:/Program Files/Git/bin/git.exe",
+    "C:/Program Files (x86)/Git/bin/git.exe",
+  ]
+  for (const candidate of candidates) {
+    if (existsSync(candidate)) {
+      return candidate
+    }
+  }
+
+  warning("Git not found in the default locations. Add git to PATH manually.")
+  return null
+}