From 2299dd84e167351711f34b3ac4e3cb80eedc8078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <oss@mateuszmikula.dev>
Date: Wed, 3 Dec 2025 18:11:09 +0100
Subject: [PATCH 1/5] Stop adding MSYS2 to PATH, take 2

---
 src/ci/scripts/install-mingw.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index da8e1d55f3ae3..3ff3ee78c3784 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -66,5 +66,5 @@ if isWindows && isKnownToBeMingwBuild; then
             ;;
     esac
 
-    ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")"
+    ciCommandAddPath "$(pwd)/${mingw_dir}/bin)"
 fi

From bddd4d176603e99c0df9e438e25a244f724a72d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <oss@mateuszmikula.dev>
Date: Wed, 3 Dec 2025 18:44:54 +0100
Subject: [PATCH 2/5] Revert "Stop adding MSYS2 to PATH, take 2"

This reverts commit 2299dd84e167351711f34b3ac4e3cb80eedc8078.
---
 src/ci/scripts/install-mingw.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index 3ff3ee78c3784..da8e1d55f3ae3 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -66,5 +66,5 @@ if isWindows && isKnownToBeMingwBuild; then
             ;;
     esac
 
-    ciCommandAddPath "$(pwd)/${mingw_dir}/bin)"
+    ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")"
 fi

From cb60e094a02cd134c684f9964d3b882104c1df2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <oss@mateuszmikula.dev>
Date: Wed, 3 Dec 2025 18:51:29 +0100
Subject: [PATCH 3/5] Prevent adding Git for Windows mingw64 dir

---
 src/ci/github-actions/jobs.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 9acad5c06b210..143afd5e095a2 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -28,14 +28,23 @@ runners:
 
   - &job-windows
     os: windows-2025
+    env:
+      # Avoid adding Git for Windows /mingw64/bin dir to PATH
+      MSYSTEM: ""
     <<: *base-job
 
   - &job-windows-8c
     os: windows-2025-8core-32gb
+    env:
+      # Avoid adding Git for Windows /mingw64/bin dir to PATH
+      MSYSTEM: ""
     <<: *base-job
 
   - &job-windows-aarch64
     os: windows-11-arm
+    env:
+      # Avoid adding Git for Windows /mingw64/bin dir to PATH
+      MSYSTEM: ""
     <<: *base-job
 
   - &job-aarch64-linux

From 0c403aa718c07bcbd70350e4e1a4c39270eb0961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <oss@mateuszmikula.dev>
Date: Wed, 3 Dec 2025 18:56:41 +0100
Subject: [PATCH 4/5] Revert "Prevent adding Git for Windows mingw64 dir"

This reverts commit cb60e094a02cd134c684f9964d3b882104c1df2e.
---
 src/ci/github-actions/jobs.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 143afd5e095a2..9acad5c06b210 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -28,23 +28,14 @@ runners:
 
   - &job-windows
     os: windows-2025
-    env:
-      # Avoid adding Git for Windows /mingw64/bin dir to PATH
-      MSYSTEM: ""
     <<: *base-job
 
   - &job-windows-8c
     os: windows-2025-8core-32gb
-    env:
-      # Avoid adding Git for Windows /mingw64/bin dir to PATH
-      MSYSTEM: ""
     <<: *base-job
 
   - &job-windows-aarch64
     os: windows-11-arm
-    env:
-      # Avoid adding Git for Windows /mingw64/bin dir to PATH
-      MSYSTEM: ""
     <<: *base-job
 
   - &job-aarch64-linux

From 3ce448b0a4d0e751aba1ad7850e35119e3233c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <oss@mateuszmikula.dev>
Date: Wed, 3 Dec 2025 19:08:39 +0100
Subject: [PATCH 5/5] different way

---
 src/ci/scripts/install-mingw.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index da8e1d55f3ae3..59da32b6cf312 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -66,5 +66,8 @@ if isWindows && isKnownToBeMingwBuild; then
             ;;
     esac
 
+    # Prevent adding /mingw64/bin Git for Windows to PATH
+    echo "MSYSTEM=" >> "$GITHUB_ENV"
+
     ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")"
 fi