Only install mingw or ucrt for new Rubies

MSP-Greg · eregon · commit ffd46bd1d2aa · 2022-01-13T19:25:34.000+01:00
diff --git a/windows.js b/windows.js
@@ -60,11 +60,14 @@ export async function install(platform, engine, version) {
 
   const winMSYS2Type = common.setupPath([`${rubyPrefix}\\bin`, ...toolchainPaths])
 
+  // install msys2 tools for all versions, only install mingw or ucrt for Rubies >= 2.4
+
   if (!['windows-2019', 'windows-2016'].includes(virtualEnv)) {
     await installMSY2Tools()
   }
 
-  if (( winMSYS2Type === 'ucrt64') || !['windows-2019', 'windows-2016'].includes(virtualEnv)) {
+  if ((( winMSYS2Type === 'ucrt64') || !['windows-2019', 'windows-2016'].includes(virtualEnv)) &&
+    (common.floatVersion(version) >= 2.4)) {
     await installGCCTools(winMSYS2Type)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,14 @@ export async function install(platform, engine, version) {`
`60`	`60`
`61`	`61`	const winMSYS2Type = common.setupPath([`${rubyPrefix}\\bin`, ...toolchainPaths])
`62`	`62`
	`63`	`+ // install msys2 tools for all versions, only install mingw or ucrt for Rubies >= 2.4`
	`64`	`+`
`63`	`65`	`if (!['windows-2019', 'windows-2016'].includes(virtualEnv)) {`
`64`	`66`	`await installMSY2Tools()`
`65`	`67`	`}`
`66`	`68`
`67`		`- if (( winMSYS2Type === 'ucrt64') \|\| !['windows-2019', 'windows-2016'].includes(virtualEnv)) {`
	`69`	`+ if ((( winMSYS2Type === 'ucrt64') \|\| !['windows-2019', 'windows-2016'].includes(virtualEnv)) &&`
	`70`	`+ (common.floatVersion(version) >= 2.4)) {`
`68`	`71`	`await installGCCTools(winMSYS2Type)`
`69`	`72`	`}`
`70`	`73`