Apply review feedbacks

Author: ntkme

dist/index.js

@@ -5,7 +5,7 @@
 min_requirements = ['~> 2.0.0', '~> 2.1.9', '>= 2.2.6'].map { |req| Gem::Requirement.new(req) }
 
 url = 'https://raw.githubusercontent.com/oneclick/rubyinstaller.org-website/master/_data/downloads.yaml'
-entries = YAML.load(URI.open(url) { |f| f.read }, symbolize_names: true)
+entries = YAML.load(URI.open(url, &:read), symbolize_names: true)
 
 versions = entries.select { |entry|
   entry[:filetype] == 'rubyinstaller7z' and
@@ -51,31 +51,32 @@
 File.binwrite 'windows-versions.json', "#{JSON.pretty_generate(versions)}\n"
 
 base_url = 'https://github.com/ntkme/setup-msys2-gcc/releases/latest/download/windows-toolchain.json'
-windows_toolchain = JSON.parse(URI.open(base_url) { |f| f.read }, symbolize_names: true)
+windows_toolchain = JSON.parse(URI.open(base_url, &:read), symbolize_names: true)
 
 versions.each do |raw_version, archs|
   version = Gem::Version.correct?(raw_version) ? Gem::Version.new(raw_version) : head_version
 
   archs.each_key do |raw_arch|
     arch = raw_arch == 'arm64' ? 'aarch64' : raw_arch
 
-    platform = case raw_version
-               when 'head', 'ucrt'
-                 "#{arch}-mingw-ucrt"
-               when 'mingw'
-                 "#{arch}-mingw32"
-               when 'mswin'
-                 "#{arch}-mswin64"
-               else
-                 if version >= Gem::Version.new('3.1.0.dev')
-                   "#{arch}-mingw-ucrt"
-                 else
-                   "#{arch}-mingw32"
-                 end
-               end
+    platform =
+      case raw_version
+      when 'head', 'ucrt'
+        "#{arch}-mingw-ucrt"
+      when 'mingw'
+        "#{arch}-mingw32"
+      when 'mswin'
+        "#{arch}-mswin64"
+      else
+        if version >= Gem::Version.new('3.1.0.dev')
+          "#{arch}-mingw-ucrt"
+        else
+          "#{arch}-mingw32"
+        end
+      end
 
-    toolchain = windows_toolchain
-      .select do |pkg|
+    toolchain =
+      windows_toolchain.select do |pkg|
         pkg[:platform] == platform && pkg[:required_ruby_version].any? do |requirement|
           Gem::Requirement.new(requirement).satisfied_by?(version)
         end

generate-windows-versions.rb

@@ -120,6 +120,17 @@ async function installMSYS2(url, rubyPrefix = process.env.RUNNER_TEMP) {
   await common.measure('Extracting  msys2 build tools', async () =>
     exec.exec('7z', ['x', downloadPath, '-aoa', '-bd', `-o${extractPath}`], { silent: true }))
 
+  // https://github.com/oneclick/rubyinstaller2/blob/HEAD/lib/ruby_installer/build/msys2_installation.rb
+  //
+  // ri2 searches for msys64 in the following order:
+  // - ENV["MSYS2_PATH"]
+  // - File.join(RbConfig::TOPDIR, "msys64")
+  // - File.join(File.dirname(RbConfig::TOPDIR), "msys64")
+  // - "C:\msys64"
+  // - ...
+  //
+  // The first option ENV["MSYS2_PATH"] is only supported in ruby >=3.0.7.
+  // Therefore we use the second option to avoid conflict with existing "C:\msys64"
   const msys2Path = path.join(rubyPrefix, 'msys64')
   if (extractPath !== msys2Path) {
     fs.symlinkSync(extractPath, msys2Path, 'junction')