fixup! fixup! fixup! fixup! fixup! ci(windows/gnu): install mingw v…

…ia `msys2/setup-msys2`
rust-lang · Jun 3, 2024 · 41d8974 · 41d8974
1 parent 308763f
commit 41d8974
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 28 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -64,15 +64,18 @@ jobs:
           msystem: ${{ matrix.mingwdir }}
           install: ${{ matrix.gcc_package }}
       - name: Add mingw tools to path
-        shell: powershell
+        shell: python
         if: matrix.mingwdir != ''
         run: |
-          $(
-            'C:\msys64\${{ matrix.mingwdir }}\bin'
-            'C:\msys64\usr\bin'
-            Get-Content $env:GITHUB_PATH
-          ) | Set-Content $env:GITHUB_PATH
-          Get-Content $env:GITHUB_PATH
+          import os
+
+          paths = [
+            r'C:\msys64\${{ matrix.mingwdir }}\bin',
+            r'C:\msys64\usr\bin',
+          ]
+          with open(os.environ["GITHUB_PATH"], "a") as f:
+            for path in paths:
+              f.write(path + "\n")
       - name: Verify mingw gcc installation
         shell: powershell
         if: matrix.mingwdir != ''
@@ -216,15 +219,18 @@ jobs:
           msystem: ${{ matrix.mingwdir }}
           install: ${{ matrix.gcc_package }}
       - name: Add mingw tools to path
-        shell: powershell
+        shell: python
         if: matrix.mingwdir != ''
         run: |
-          $(
-            'C:\msys64\${{ matrix.mingwdir }}\bin'
-            'C:\msys64\usr\bin'
-            Get-Content $env:GITHUB_PATH
-          ) | Set-Content $env:GITHUB_PATH
-          Get-Content $env:GITHUB_PATH
+          import os
+
+          paths = [
+            r'C:\msys64\${{ matrix.mingwdir }}\bin',
+            r'C:\msys64\usr\bin',
+          ]
+          with open(os.environ["GITHUB_PATH"], "a") as f:
+            for path in paths:
+              f.write(path + "\n")
       - name: Verify mingw gcc installation
         shell: powershell
         if: matrix.mingwdir != ''
@@ -374,15 +380,18 @@ jobs:
           msystem: ${{ matrix.mingwdir }}
           install: ${{ matrix.gcc_package }}
       - name: Add mingw tools to path
-        shell: powershell
+        shell: python
         if: matrix.mingwdir != ''
         run: |
-          $(
-            'C:\msys64\${{ matrix.mingwdir }}\bin'
-            'C:\msys64\usr\bin'
-            Get-Content $env:GITHUB_PATH
-          ) | Set-Content $env:GITHUB_PATH
-          Get-Content $env:GITHUB_PATH
+          import os
+
+          paths = [
+            r'C:\msys64\${{ matrix.mingwdir }}\bin',
+            r'C:\msys64\usr\bin',
+          ]
+          with open(os.environ["GITHUB_PATH"], "a") as f:
+            for path in paths:
+              f.write(path + "\n")
       - name: Verify mingw gcc installation
         shell: powershell
         if: matrix.mingwdir != ''

diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml
@@ -58,15 +58,18 @@ jobs: # skip-master skip-pr skip-stable
           msystem: ${{ matrix.mingwdir }}
           install: ${{ matrix.gcc_package }}
       - name: Add mingw tools to path
-        shell: powershell
+        shell: python
         if: matrix.mingwdir != ''
         run: |
-          $(
-            'C:\msys64\${{ matrix.mingwdir }}\bin'
-            'C:\msys64\usr\bin'
-            Get-Content $env:GITHUB_PATH
-          ) | Set-Content $env:GITHUB_PATH
-          Get-Content $env:GITHUB_PATH
+          import os
+
+          paths = [
+            r'C:\msys64\${{ matrix.mingwdir }}\bin',
+            r'C:\msys64\usr\bin',
+          ]
+          with open(os.environ["GITHUB_PATH"], "a") as f:
+            for path in paths:
+              f.write(path + "\n")
       - name: Verify mingw gcc installation
         shell: powershell
         if: matrix.mingwdir != ''