Reconfigure environment for GNU toolchain (#3019)

riverar · web-flow · commit 2b1cd638ca6e · 2024-05-02T21:39:52.000-05:00
diff --git a/.github/actions/fix-environment/action.yml b/.github/actions/fix-environment/action.yml
@@ -20,13 +20,9 @@ runs:
       run: |
         switch -Wildcard ("${{ matrix.target }}")
         {
-          "i686-pc-windows-gnu"
+          "*-pc-windows-gnu"
           {
-            "C:\msys64\mingw32\bin" >> $env:GITHUB_PATH
-          }
-          "x86_64-pc-windows-gnu"
-          {
-            "C:\msys64\mingw64\bin" >> $env:GITHUB_PATH
+            "C:\msys64\mingw64\bin;C:\msys64\mingw32\bin" >> $env:GITHUB_PATH
           }
           "i686*"
           {
@@ -53,4 +49,4 @@ runs:
             "INCLUDE=C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\cppwinrt" `
               >> $env:GITHUB_ENV
           }
-        }
+        }

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,9 @@ runs:`
`20`	`20`	`run: \|`
`21`	`21`	`switch -Wildcard ("${{ matrix.target }}")`
`22`	`22`	`{`
`23`		`- "i686-pc-windows-gnu"`
	`23`	`+ "*-pc-windows-gnu"`
`24`	`24`	`{`
`25`		`- "C:\msys64\mingw32\bin" >> $env:GITHUB_PATH`
`26`		`- }`
`27`		`- "x86_64-pc-windows-gnu"`
`28`		`- {`
`29`		`- "C:\msys64\mingw64\bin" >> $env:GITHUB_PATH`
	`25`	`+ "C:\msys64\mingw64\bin;C:\msys64\mingw32\bin" >> $env:GITHUB_PATH`
`30`	`26`	`}`
`31`	`27`	`"i686*"`
`32`	`28`	`{`
`@@ -53,4 +49,4 @@ runs:`
`53`	`49`	"INCLUDE=C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\cppwinrt" `
`54`	`50`	`>> $env:GITHUB_ENV`
`55`	`51`	`}`
`56`		`- }`
	`52`	`+ }`