Document mingw and mswin in the README

* It's not always gcc, can be e.g. clang too

.github/workflows/test.yml

@@ -1,5 +1,6 @@
 name: Test this action
 on:
+  pull_request:
   push:
     branches-ignore:
     - master
@@ -9,24 +10,18 @@ on:
     paths-ignore:
     - README.md
 jobs:
-  test:
+  common:
     strategy:
       fail-fast: false
       matrix:
         os: [ ubuntu-16.04, ubuntu-18.04, macos-latest, windows-latest ]
         # Use various version syntaxes here for testing
-        ruby: [ .ruby-version, .tool-versions, 2.2, 2.3, ruby-head, jruby, jruby-head, truffleruby, truffleruby-head, rubinius ]
+        ruby: [ 2.2, 2.3, .ruby-version, .tool-versions, ruby-head, jruby, jruby-head, truffleruby, truffleruby-head ]
         exclude:
         - os: windows-latest
           ruby: truffleruby
         - os: windows-latest
           ruby: truffleruby-head
-        - os: ubuntu-16.04
-          ruby: rubinius
-        - os: macos-latest
-          ruby: rubinius
-        - os: windows-latest
-          ruby: rubinius
     name: ${{ matrix.os }} ${{ matrix.ruby }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -34,9 +29,19 @@ jobs:
     - uses: ./
       with:
         ruby-version: ${{ matrix.ruby }}
-    - run: ruby --version
-    - run: ridk version
-      if: matrix.os == 'windows-latest' && !startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, '2.3') && !startsWith(matrix.ruby, '2.2')
+    - run: ruby -v
+    - name: build compiler
+      run: |
+        ruby -e "puts 'build compiler: ' + RbConfig::CONFIG.fetch('CC_VERSION_MESSAGE', 'unknown').lines.first"
+    - name: ridk version (mingw)
+      if: matrix.os == 'windows-latest'
+      run: |
+        $abi, $plat = $(ruby -e "STDOUT.write RbConfig::CONFIG['ruby_version'] + ' ' + RUBY_PLATFORM").split(' ')
+        if (($abi -ge '2.4') -and $plat.Contains('mingw')) {
+          ridk version
+        } else {
+          echo 'ridk is unavailable'
+        }
     - name: Subprocess test
       run: ruby test_subprocess.rb
     - name: OpenSSL version
@@ -49,6 +54,61 @@ jobs:
     - run: bundle install
     - run: bundle exec rake --version
 
+  specials:
+    strategy:
+      fail-fast: false
+      matrix:
+        cfg:
+        - { ruby: rubinius, os: ubuntu-18.04   }
+        - { ruby: mingw   , os: windows-latest }
+        - { ruby: mswin   , os: windows-latest }
+    name: ${{ matrix.cfg.os }} ${{ matrix.cfg.ruby }}
+    runs-on: ${{ matrix.cfg.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./
+      with:
+        ruby-version: ${{ matrix.cfg.ruby }}
+    - run: ruby -v
+    - name: build compiler
+      run: |
+        ruby -e "puts 'build compiler: ' + RbConfig::CONFIG.fetch('CC_VERSION_MESSAGE', 'unknown').lines.first"
+    - name: ridk version (mingw)
+      if: matrix.cfg.os == 'windows-latest'
+      run: |
+        $abi, $plat = $(ruby -e "STDOUT.write RbConfig::CONFIG['ruby_version'] + ' ' + RUBY_PLATFORM").split(' ')
+        if (($abi -ge '2.4') -and $plat.Contains('mingw')) {
+          ridk version
+        } else {
+          echo 'ridk is unavailable'
+        }
+    - name: Subprocess test
+      run: ruby test_subprocess.rb
+    - name: OpenSSL version
+      run: ruby -ropenssl -e 'puts OpenSSL::OPENSSL_LIBRARY_VERSION'
+    - name: OpenSSL test
+      run: ruby -ropen-uri -e 'puts open(%{https://rubygems.org/}) { |f| f.read(1024) }'
+    - name: C extension test
+      if: endsWith(matrix.cfg.ruby, 'mswin') == false
+      run: gem install json:2.2.0 --no-document
+    - name: C extension test (mswin cmd)
+      if: endsWith(matrix.cfg.ruby, 'mswin')
+      shell: cmd
+      run: |
+        call %VCVARS%
+        gem install json:2.2.0 --no-document
+    - name: C extension test (mswin ps1)
+      if: endsWith(matrix.cfg.ruby, 'mswin')
+      run: |
+        cmd.exe /c "$env:VCVARS && set" | Foreach-Object {
+          $p, $v = $_.split('=')
+          Set-Item -path env:$p -value $v
+        }
+        gem install json:2.2.0 --no-document
+    - run: bundle --version
+    - run: bundle install
+    - run: bundle exec rake --version
+
   lint:
     runs-on: ubuntu-latest
     steps:

README.md

@@ -1,6 +1,7 @@
 # setup-ruby
 
 Note: this action used to be at `eregon/use-ruby-action` and was moved to the `ruby` organization.
+Please [update](https://github.com/ruby/setup-ruby/releases/tag/v1.13.0) if you are using `eregon/use-ruby-action`.
 
 This action downloads a prebuilt ruby and adds it to the `PATH`.
 
@@ -16,11 +17,12 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 
 | Interpreter | Versions |
 | ----------- | -------- |
-| Ruby | 2.2, 2.3.0 - 2.3.8, 2.4.0 - 2.4.9, 2.5.0 - 2.5.7, 2.6.0 - 2.6.5, 2.7.0, head |
-| JRuby | 9.2.9.0, head |
-| TruffleRuby | 19.3.0, 19.3.1, 20.0.0, head |
+| Ruby | 2.2, 2.3.0 - 2.3.8, 2.4.0 - 2.4.9, 2.5.0 - 2.5.7, 2.6.0 - 2.6.5, 2.7.0, head, mingw, mswin |
+| JRuby | 9.2.9.0 - 9.2.10.0, head |
+| TruffleRuby | 19.3.0 - 20.0.0, head |
 | Rubinius | 4.14 |
 
+`mingw` and `mswin` are `ruby-head` builds using the MSYS2 and MSVC toolchains on Windows.  
 Note that Ruby ≤ 2.3 and the OpenSSL version it needs (1.0.2) are both end-of-life,
 which means Ruby ≤ 2.3 is unmaintained and considered insecure.
 On Windows, Ruby 2.4 uses OpenSSL 1.0.2, which is no longer maintained.
@@ -40,7 +42,10 @@ Rubinius is only available on `ubuntu-latest`.
 
 The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder)
 and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).
-`ruby-head` is generated by [ruby-dev-builder](https://github.com/ruby/ruby-dev-builder) and `truffleruby-head` is generated by [truffleruby-dev-builder](https://github.com/ruby/truffleruby-dev-builder).
+`mingw` and `mswin` builds are generated by [ruby-loco](https://github.com/MSP-Greg/ruby-loco).
+`ruby-head` is generated by [ruby-dev-builder](https://github.com/ruby/ruby-dev-builder),
+`jruby-head` is generated by [jruby-dev-builder](https://github.com/ruby/jruby-dev-builder)
+and `truffleruby-head` is generated by [truffleruby-dev-builder](https://github.com/ruby/truffleruby-dev-builder).
 The full list of available Ruby versions can be seen in [ruby-builder-versions.js](ruby-builder-versions.js)
 for Ubuntu and macOS and in [windows-versions.js](windows-versions.js) for Windows.
 

dist/index.js

@@ -1035,7 +1035,7 @@ function parseRubyEngineAndVersion(rubyVersion) {
   }
 
   let engine, version
-  if (rubyVersion.match(/^\d+/)) { // X.Y.Z => ruby-X.Y.Z
+  if (rubyVersion.match(/^(\d+|head|mingw|mswin)/)) { // X.Y.Z => ruby-X.Y.Z
     engine = 'ruby'
     version = rubyVersion
   } else if (!rubyVersion.includes('-')) { // myruby -> myruby-stableVersion
@@ -1391,7 +1391,7 @@ function getVersions(platform) {
       "head"
     ],
     "jruby": [
-      "9.2.9.0",
+      "9.2.9.0", "9.2.10.0",
       "head"
     ],
     "truffleruby": [
@@ -3371,7 +3371,9 @@ const versions = {
   "2.6.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-2.6.4-1-x64.7z",
   "2.6.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-2.6.5-1-x64.7z",
   "2.7.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x64.7z",
-  "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z"
+  "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z",
+  "mingw": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z",
+  "mswin": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z"
 }
 
 
@@ -4874,10 +4876,12 @@ async function install(platform, ruby) {
   const rubyPrefix = `${drive}:\\${base}`
 
   const [hostedRuby, msys2] = await linkMSYS2()
-  setupPath(msys2, rubyPrefix)
+  setupPath((ruby === 'ruby-mswin' ? null : msys2), rubyPrefix)
 
   if (version.startsWith('2.2') || version.startsWith('2.3')) {
     core.exportVariable('SSL_CERT_FILE', `${hostedRuby}\\ssl\\cert.pem`)
+  } else if (version === 'mswin') {
+    setupMSWin(hostedRuby)
   }
 
   if (!fs.existsSync(`${rubyPrefix}\\bin\\bundle.cmd`)) {
@@ -4887,6 +4891,25 @@ async function install(platform, ruby) {
   return rubyPrefix
 }
 
+function setupMSWin(hostedRuby) {
+  // All standard MSVC OpenSSL builds use C:\Program Files\Common Files\SSL
+  const certsDir = 'C:\\Program Files\\Common Files\\SSL\\certs'
+  if (!fs.existsSync(certsDir)) {
+    fs.mkdirSync(certsDir)
+  }
+
+  // Copy cert.pem from hosted Ruby
+  const cert = 'C:\\Program Files\\Common Files\\SSL\\cert.pem'
+  if (!fs.existsSync(cert)) {
+    const hostedCert = `${hostedRuby}\\ssl\\cert.pem`
+    fs.copyFileSync(hostedCert, cert)
+  }
+
+  // Add a convenience VCVARS environment variable to ease setting up MSVC
+  // This assumes a single Visual Studio version being available in the windows-latest image
+  core.exportVariable('VCVARS', '"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"')
+}
+
 async function linkMSYS2() {
   const toolCacheVersions = tc.findAllVersions('Ruby')
   toolCacheVersions.sort()
@@ -4898,7 +4921,9 @@ async function linkMSYS2() {
 
   const hostedMSYS2 = `${latestHostedRuby}\\msys64`
   const msys2 = 'C:\\msys64'
-  await exec.exec(`cmd /c mklink /D ${msys2} ${hostedMSYS2}`)
+  if (!fs.existsSync(msys2)) {
+    await exec.exec(`cmd /c mklink /D ${msys2} ${hostedMSYS2}`)
+  }
   return [latestHostedRuby, msys2]
 }
 

generate-windows-versions.rb

@@ -25,6 +25,8 @@ versions = entries.select { |entry|
 }.to_h
 
 versions['head'] = 'https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z'
+versions['mingw'] = 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z'
+versions['mswin'] = 'https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z'
 
 js = "export const versions = #{JSON.pretty_generate(versions)}\n"
 File.write 'windows-versions.js', js

index.js

@@ -46,7 +46,7 @@ function parseRubyEngineAndVersion(rubyVersion) {
   }
 
   let engine, version
-  if (rubyVersion.match(/^\d+/)) { // X.Y.Z => ruby-X.Y.Z
+  if (rubyVersion.match(/^(\d+|head|mingw|mswin)/)) { // X.Y.Z => ruby-X.Y.Z
     engine = 'ruby'
     version = rubyVersion
   } else if (!rubyVersion.includes('-')) { // myruby -> myruby-stableVersion

ruby-builder-versions.js

@@ -10,7 +10,7 @@ export function getVersions(platform) {
       "head"
     ],
     "jruby": [
-      "9.2.9.0",
+      "9.2.9.0", "9.2.10.0",
       "head"
     ],
     "truffleruby": [

windows-versions.js

@@ -24,5 +24,7 @@ export const versions = {
   "2.6.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-2.6.4-1-x64.7z",
   "2.6.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-2.6.5-1-x64.7z",
   "2.7.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x64.7z",
-  "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z"
+  "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z",
+  "mingw": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z",
+  "mswin": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z"
 }

windows.js

@@ -33,10 +33,12 @@ export async function install(platform, ruby) {
   const rubyPrefix = `${drive}:\\${base}`
 
   const [hostedRuby, msys2] = await linkMSYS2()
-  setupPath(msys2, rubyPrefix)
+  setupPath((ruby === 'ruby-mswin' ? null : msys2), rubyPrefix)
 
   if (version.startsWith('2.2') || version.startsWith('2.3')) {
     core.exportVariable('SSL_CERT_FILE', `${hostedRuby}\\ssl\\cert.pem`)
+  } else if (version === 'mswin') {
+    setupMSWin(hostedRuby)
   }
 
   if (!fs.existsSync(`${rubyPrefix}\\bin\\bundle.cmd`)) {
@@ -46,6 +48,25 @@ export async function install(platform, ruby) {
   return rubyPrefix
 }
 
+function setupMSWin(hostedRuby) {
+  // All standard MSVC OpenSSL builds use C:\Program Files\Common Files\SSL
+  const certsDir = 'C:\\Program Files\\Common Files\\SSL\\certs'
+  if (!fs.existsSync(certsDir)) {
+    fs.mkdirSync(certsDir)
+  }
+
+  // Copy cert.pem from hosted Ruby
+  const cert = 'C:\\Program Files\\Common Files\\SSL\\cert.pem'
+  if (!fs.existsSync(cert)) {
+    const hostedCert = `${hostedRuby}\\ssl\\cert.pem`
+    fs.copyFileSync(hostedCert, cert)
+  }
+
+  // Add a convenience VCVARS environment variable to ease setting up MSVC
+  // This assumes a single Visual Studio version being available in the windows-latest image
+  core.exportVariable('VCVARS', '"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"')
+}
+
 async function linkMSYS2() {
   const toolCacheVersions = tc.findAllVersions('Ruby')
   toolCacheVersions.sort()
@@ -57,7 +78,9 @@ async function linkMSYS2() {
 
   const hostedMSYS2 = `${latestHostedRuby}\\msys64`
   const msys2 = 'C:\\msys64'
-  await exec.exec(`cmd /c mklink /D ${msys2} ${hostedMSYS2}`)
+  if (!fs.existsSync(msys2)) {
+    await exec.exec(`cmd /c mklink /D ${msys2} ${hostedMSYS2}`)
+  }
   return [latestHostedRuby, msys2]
 }