From 582312146837300e1babc421f92ac74477e542b4 Mon Sep 17 00:00:00 2001
From: rami3l <rami3l@outlook.com>
Date: Mon, 3 Jun 2024 11:58:59 +0800
Subject: [PATCH] fixup! ci(windows/gnu): install `mingw` via
 `msys2/setup-msys2`

---
 .github/workflows/ci.yaml                     | 27 ++++++++++++++-----
 .../windows-builds-template.yaml              |  9 +++++--
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d1a62accff3..58f0392c3a7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -64,8 +64,13 @@ jobs:
         shell: powershell
         if: matrix.mingwdir != ''
         run: |
-          echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-          echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+          $(
+            'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
+            'C:\msys64\usr\bin' + "`r`n"
+            Get-Content $env:GITHUB_PATH -Raw
+          ) | Set-Content $env:GITHUB_PATH
+          Get-Command x86_64-w64-mingw32-gcc
+          Get-Command i686-w64-mingw32-gcc
       - name: Set PATH
         run: |
           echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -204,8 +209,13 @@ jobs:
         shell: powershell
         if: matrix.mingwdir != ''
         run: |
-          echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-          echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+          $(
+            'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
+            'C:\msys64\usr\bin' + "`r`n"
+            Get-Content $env:GITHUB_PATH -Raw
+          ) | Set-Content $env:GITHUB_PATH
+          Get-Command x86_64-w64-mingw32-gcc
+          Get-Command i686-w64-mingw32-gcc
       - name: Set PATH
         run: |
           echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -348,8 +358,13 @@ jobs:
         shell: powershell
         if: matrix.mingwdir != ''
         run: |
-          echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-          echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+          $(
+            'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
+            'C:\msys64\usr\bin' + "`r`n"
+            Get-Content $env:GITHUB_PATH -Raw
+          ) | Set-Content $env:GITHUB_PATH
+          Get-Command x86_64-w64-mingw32-gcc
+          Get-Command i686-w64-mingw32-gcc
       - name: Set PATH
         run: |
           echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml
index 447913d88b8..baa49b1afb0 100644
--- a/ci/actions-templates/windows-builds-template.yaml
+++ b/ci/actions-templates/windows-builds-template.yaml
@@ -56,8 +56,13 @@ jobs: # skip-master skip-pr skip-stable
         shell: powershell
         if: matrix.mingwdir != ''
         run: |
-          echo "C:\msys64\usr\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-          echo "C:\msys64\${{ matrix.mingwdir }}\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+          $(
+            'C:\msys64\${{ matrix.mingwdir }}\bin' + "`r`n"
+            'C:\msys64\usr\bin' + "`r`n"
+            Get-Content $env:GITHUB_PATH -Raw
+          ) | Set-Content $env:GITHUB_PATH
+          Get-Command x86_64-w64-mingw32-gcc
+          Get-Command i686-w64-mingw32-gcc
       - name: Set PATH
         run: |
           echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8