Document the choice of the drive on Windows

* That way it's always perfectly synchronized with the action. In
  practice querying another repository sometimes returned a stale copy.
* Avoids an extra HTTPS request.
* The axios dependency is no longer needed.
* Makes it possible to tweak the versions available according to the platform.

.github/workflows/test.yml

@@ -1,5 +1,12 @@
 name: Test this action
-on: [push]
+on:
+  push:
+    branches-ignore:
+    - v1
+    tags-ignore:
+    - '*'
+    paths-ignore:
+    - README.md
 jobs:
   test:
     strategy:
@@ -7,14 +14,16 @@ jobs:
       matrix:
         os: [ ubuntu-16.04, ubuntu-18.04, macos-latest, windows-latest ]
         # Use various version syntaxes here for testing
-        ruby: [ .ruby-version, 2.3, ruby-2.4, 2.5, ruby-2.6.5, 2.7.0, jruby, truffleruby ]
+        ruby: [ .ruby-version, 2.3, ruby-2.4, 2.5, ruby-2.6.5, 2.7.0, jruby, truffleruby, rubinius ]
         exclude:
-        - os: windows-latest
-          ruby: 2.3
-        - os: windows-latest
-          ruby: jruby
         - os: windows-latest
           ruby: truffleruby
+        - os: ubuntu-16.04
+          ruby: rubinius
+        - os: macos-latest
+          ruby: rubinius
+        - os: windows-latest
+          ruby: rubinius
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
@@ -23,14 +32,16 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
     - run: ruby --version
     - run: ridk version
-      if: matrix.os == 'windows-latest'
+      if: matrix.os == 'windows-latest' && !startsWith(matrix.ruby, '2.3')
+    - 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(2014) }'
+      run: ruby -ropen-uri -e 'puts open(%{https://rubygems.org/}) { |f| f.read(1024) }'
     - name: C extension test
-      run: gem install json --no-document
+      run: gem install json:2.2.0 --no-document
-    - name: Check that Bundler is installed
+    - name: Bundler version
       run: bundle --version
-    - name: Check that Bundler works
+    - name: Bundler test
       run: bundle install
 
   lint:

Gemfile

@@ -2,4 +2,4 @@
 source 'https://rubygems.org'
 
 gem "path"
-gem "json"
+gem "json", "2.2.0"

README.md

@@ -1,8 +1,8 @@
-# use-ruby
+# use-ruby-action
 
-This action downloads a prebuilt ruby and adds it to `$PATH`.
+This action downloads a prebuilt ruby and adds it to the `PATH`.
 
-It is very efficient and takes about 5 seconds to download, extract and add the given Ruby to `$PATH`.
+It is very efficient and takes about 5 seconds to download, extract and add the given Ruby to the `PATH`.
 No extra packages need to be installed.
 
 ### Supported Versions
@@ -11,29 +11,31 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 
 | Interpreter | Versions |
 | ----------- | -------- |
-| Ruby | 2.3.8, 2.4.9, 2.5.7, 2.6.5, 2.7.0 |
+| Ruby | 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 |
 | JRuby | 9.2.9.0 |
-| TruffleRuby  | 19.3.0 |
+| TruffleRuby | 19.3.0, 19.3.1 |
-
+| Rubinius | 4.13 |
-The recommended way to refer to these versions is:
-`2.3`, `2.4`, `2.5`, `2.6`, `2.7`, `jruby`, `truffleruby`.  
-That way, the latest compatible release is used, which contains the most bug fixes.
-
-See https://github.com/eregon/ruby-install-builder/blob/metadata/versions.json
-for the always up-to-date list of available Ruby versions.
 
 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.
 
 ### Supported Platforms
 
-The action works for all GitHub-hosted runners:
+The action works for all [GitHub-hosted runners](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners).
-`ubuntu-16.04`, `ubuntu-18.04`, `macos-latest` and `windows-latest`.
 
-Ruby 2.3, JRuby and TruffleRuby are not yet supported on `windows-latest`.
+| Operating System | Versions |
+| ----------- | -------- |
+| Ubuntu  | `ubuntu-latest` (= `ubuntu-18.04`), `ubuntu-16.04` |
+| macOS   | `macos-latest` |
+| Windows | `windows-latest` |
 
-The prebuilt rubies are generated by https://github.com/eregon/ruby-install-builder
+Rubinius is only available on `ubuntu-latest`.
-and on Windows by https://github.com/oneclick/rubyinstaller2.
+
+The prebuilt rubies are generated by [eregon/ruby-install-builder](https://github.com/eregon/ruby-install-builder)
+and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).  
+The full list of available Ruby versions can be seen in [ruby-install-builder-versions.js](ruby-install-builder-versions.js)
+for Ubuntu and macOS and in [windows-versions.js](windows-versions.js) for Windows.
 
 ## Usage
 
@@ -47,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: eregon/use-ruby-action@master
+    - uses: eregon/use-ruby-action@v1
       with:
         ruby-version: 2.6
     - run: ruby -v
@@ -70,7 +72,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - uses: eregon/use-ruby-action@master
+    - uses: eregon/use-ruby-action@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - run: ruby -v
@@ -88,12 +90,42 @@ jobs:
 
 Currently, Bundler is guaranteed to be installed for all versions.
 If the Ruby ships with Bundler (Ruby >= 2.6), that version is used.
-Otherwise (Ruby < 2.6), the latest version of Bundler is installed when that Ruby was built.
+Otherwise (Ruby < 2.6), Bundler 1 is installed when that Ruby was built.
+
+### Caching `bundle install`
+
+You can cache the installed gems with these two steps:
+
+```yaml
+    - uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-
+    - name: bundle install
+      run: |
+        bundle config path vendor/bundle
+        bundle install --jobs 4 --retry 3
+```
+
+When using a single job with a Ruby version, replace `${{ matrix.ruby }}` with the Ruby version.  
+When using `.ruby-version`, replace `${{ matrix.ruby }}` with `${{ hashFiles('.ruby-version') }}`.
+
+This uses the [cache action](https://github.com/actions/cache).
+The code above is a more complete version of the [Ruby - Bundler example](https://github.com/actions/cache/blob/master/examples.md#ruby---bundler).
+Make sure to include `use-ruby` in the `key` to avoid conflicting with previous caches.
 
 ## Limitations
 
 * This action currently only works with GitHub-hosted runners, not private runners.
 
+## Versioning
+
+This action follows semantic versioning with a moving `v1` branch.
+This follows the [recommendations](https://github.com/actions/toolkit/blob/master/docs/action-versioning.md) of GitHub Actions.
+
 ## Credits
 
 Most of the Windows logic is from https://github.com/MSP-Greg/actions-ruby by MSP-Greg.
+Many thanks to MSP-Greg and Lars Kanis for the help with Ruby Installer.

action.yml

@@ -1,5 +1,5 @@
 name: 'Setup Ruby, JRuby and TruffleRuby'
-description: 'Download a prebuilt Ruby and add it to $PATH in 5 seconds'
+description: 'Download a prebuilt Ruby and add it to the PATH in 5 seconds'
 author: 'Benoit Daloze'
 branding:
   color: red

generate-ruby-installer-versions.rb

@@ -0,0 +1,27 @@
+require 'net/http'
+require 'yaml'
+require 'json'
+
+url = 'https://raw.githubusercontent.com/oneclick/rubyinstaller.org-website/master/_data/downloads.yaml'
+entries = YAML.load(Net::HTTP.get(URI(url)), symbolize_names: true)
+
+versions = entries.select { |entry|
+  entry[:filetype] == 'rubyinstaller7z' and
+  entry[:name].include?('(x64)')
+}.group_by { |entry|
+  entry[:name][/Ruby (\d+\.\d+\.\d+)/, 1]
+}.map { |version, builds|
+  unless builds.sort_by { |build| build[:name] } == builds.reverse
+    raise "not sorted as expected for #{version}"
+  end
+  [version, builds.first]
+}.sort_by { |version, entry|
+  version
+}.select { |version, entry|
+  version >= "2.3"
+}.map { |version, entry|
+  [version, entry[:href]]
+}.to_h
+
+js = "export const versions = #{JSON.pretty_generate(versions)}\n"
+File.write 'windows-versions.js', js

index.js

@@ -1,52 +1,30 @@
 const os = require('os')
 const fs = require('fs')
 const core = require('@actions/core')
-const io = require('@actions/io')
-const tc = require('@actions/tool-cache')
-const axios = require('axios')
-const windows = require('./windows')
-
-const releasesURL = 'https://github.com/eregon/ruby-install-builder/releases'
-const metadataURL = 'https://raw.githubusercontent.com/eregon/ruby-install-builder/metadata'
 
 async function run() {
   try {
     const platform = getVirtualEnvironmentName()
-    const ruby = await getRubyEngineAndVersion(core.getInput('ruby-version'))
+    const [engine, version] = parseRubyEngineAndVersion(core.getInput('ruby-version'))
 
-    let rubyPrefix
+    let installer
-    if (platform === 'windows-latest') {
+    if (platform === 'windows-latest' && engine !== 'jruby') {
-      rubyPrefix = await windows.downloadExtractAndSetPATH(ruby)
+      installer = require('./windows')
     } else {
-      rubyPrefix = await downloadAndExtract(platform, ruby)
+      installer = require('./ruby-install-builder')
-      core.addPath(`${rubyPrefix}/bin`)
     }
+
+    const engineVersions = installer.getAvailableVersions(platform, engine)
+    const ruby = validateRubyEngineAndVersion(platform, engineVersions, engine, version)
+
+    const rubyPrefix = await installer.install(platform, ruby)
     core.setOutput('ruby-prefix', rubyPrefix)
   } catch (error) {
     core.setFailed(error.message)
   }
 }
 
-async function downloadAndExtract(platform, ruby) {
+function parseRubyEngineAndVersion(rubyVersion) {
-  const rubiesDir = `${process.env.HOME}/.rubies`
-  await io.mkdirP(rubiesDir)
-
-  const tag = await getLatestReleaseTag()
-  const url = `${releasesURL}/download/${tag}/${ruby}-${platform}.tar.gz`
-  console.log(url)
-
-  const downloadPath = await tc.downloadTool(url)
-  await tc.extractTar(downloadPath, rubiesDir)
-
-  return `${rubiesDir}/${ruby}`
-}
-
-async function getLatestReleaseTag() {
-  const response = await axios.get(`${metadataURL}/latest_release.tag`)
-  return response.data.trim()
-}
-
-async function getRubyEngineAndVersion(rubyVersion) {
   if (rubyVersion === '.ruby-version') { // Read from .ruby-version
     rubyVersion = fs.readFileSync('.ruby-version', 'utf8').trim()
     console.log(`Using ${rubyVersion} as input from file .ruby-version`)
@@ -63,11 +41,12 @@ async function getRubyEngineAndVersion(rubyVersion) {
     [engine, version] = rubyVersion.split('-', 2)
   }
 
-  const response = await axios.get(`${metadataURL}/versions.json`)
+  return [engine, version]
-  const stableVersions = response.data
+}
-  const engineVersions = stableVersions[engine]
+
+function validateRubyEngineAndVersion(platform, engineVersions, engine, version) {
   if (!engineVersions) {
-    throw new Error(`Unknown engine ${engine} (input: ${rubyVersion})`)
+    throw new Error(`Unknown engine ${engine} on ${platform}`)
   }
 
   if (!engineVersions.includes(version)) {
@@ -76,10 +55,9 @@ async function getRubyEngineAndVersion(rubyVersion) {
     if (found) {
       version = found
     } else {
-      throw new Error(`Unknown version ${version} for ${engine}
+      throw new Error(`Unknown version ${version} for ${engine} on ${platform}
-        input: ${rubyVersion}
+        available versions for ${engine} on ${platform}: ${engineVersions.join(', ')}
-        available versions for ${engine}: ${engineVersions.join(', ')}
+        File an issue at https://github.com/eregon/use-ruby-action/issues if would like support for a new version`)
-        File an issue at https://github.com/eregon/ruby-install-builder/issues if would like support for a new version`)
     }
   }
 
@@ -88,11 +66,11 @@ async function getRubyEngineAndVersion(rubyVersion) {
 
 function getVirtualEnvironmentName() {
   const platform = os.platform()
-  if (platform == 'linux') {
+  if (platform === 'linux') {
     return `ubuntu-${findUbuntuVersion()}`
-  } else if (platform == 'darwin') {
+  } else if (platform === 'darwin') {
     return 'macos-latest'
-  } else if (platform == 'win32') {
+  } else if (platform === 'win32') {
     return 'windows-latest'
   } else {
     throw new Error(`Unknown platform ${platform}`)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "use-ruby-action",
   "version": "0.1.0",
-  "description": "Download a prebuilt ruby and add it to $PATH",
+  "description": "Download a prebuilt Ruby and add it to the PATH in 5 seconds",
   "main": "index.js",
   "scripts": {
     "lint": "eslint *.js",
@@ -24,9 +24,9 @@
   "homepage": "https://github.com/eregon/use-ruby-action",
   "dependencies": {
     "@actions/core": "^1.1.1",
+    "@actions/exec": "^1.0.1",
     "@actions/io": "^1.0.1",
-    "@actions/tool-cache": "^1.1.2",
+    "@actions/tool-cache": "^1.1.2"
-    "axios": "^0.19.0"
   },
   "devDependencies": {
     "@zeit/ncc": "^0.20.5",

ruby-install-builder-versions.js

@@ -0,0 +1,25 @@
+export function getVersions(platform) {
+  const versions = {
+    "ruby": [
+      "2.3.0", "2.3.1", "2.3.2", "2.3.3", "2.3.4", "2.3.5", "2.3.6", "2.3.7", "2.3.8",
+      "2.4.0", "2.4.1", "2.4.2", "2.4.3", "2.4.4", "2.4.5", "2.4.6", "2.4.7", "2.4.9",
+      "2.5.0", "2.5.1", "2.5.2", "2.5.3", "2.5.4", "2.5.5", "2.5.6", "2.5.7",
+      "2.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5",
+      "2.7.0"
+    ],
+    "jruby": [
+      "9.2.9.0"
+    ],
+    "truffleruby": [
+      "19.3.0", "19.3.1"
+    ]
+  }
+
+  if (platform === 'ubuntu-18.04') {
+    versions['rubinius'] = [
+      "4.13"
+    ]
+  }
+
+  return versions
+}

ruby-install-builder.js

@@ -0,0 +1,37 @@
+const os = require('os')
+const path = require('path')
+const core = require('@actions/core')
+const io = require('@actions/io')
+const tc = require('@actions/tool-cache')
+const rubyBuilderVersions = require('./ruby-install-builder-versions')
+
+const builderReleaseTag = 'builds-newer-openssl'
+const releasesURL = 'https://github.com/eregon/ruby-install-builder/releases'
+
+export function getAvailableVersions(platform, engine) {
+  return rubyBuilderVersions.getVersions(platform)[engine]
+}
+
+export async function install(platform, ruby) {
+  const rubyPrefix = await downloadAndExtract(platform, ruby)
+
+  core.addPath(path.join(rubyPrefix, 'bin'))
+  if (ruby.startsWith('rubinius')) {
+    core.addPath(path.join(rubyPrefix, 'gems', 'bin'))
+  }
+
+  return rubyPrefix
+}
+
+async function downloadAndExtract(platform, ruby) {
+  const rubiesDir = path.join(os.homedir(), '.rubies')
+  await io.mkdirP(rubiesDir)
+
+  const url = `${releasesURL}/download/${builderReleaseTag}/${ruby}-${platform}.tar.gz`
+  console.log(url)
+
+  const downloadPath = await tc.downloadTool(url)
+  await tc.extractTar(downloadPath, rubiesDir)
+
+  return path.join(rubiesDir, ruby)
+}

windows-versions.js

@@ -0,0 +1,26 @@
+export const versions = {
+  "2.3.0": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.3.0-x64-mingw32.7z",
+  "2.3.1": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.3.1-x64-mingw32.7z",
+  "2.3.3": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.3.3-x64-mingw32.7z",
+  "2.4.1": "https://github.com/oneclick/rubyinstaller2/releases/download/2.4.1-2/rubyinstaller-2.4.1-2-x64.7z",
+  "2.4.2": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.2-2/rubyinstaller-2.4.2-2-x64.7z",
+  "2.4.3": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.3-2/rubyinstaller-2.4.3-2-x64.7z",
+  "2.4.4": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.4-2/rubyinstaller-2.4.4-2-x64.7z",
+  "2.4.5": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.5-1/rubyinstaller-2.4.5-1-x64.7z",
+  "2.4.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.6-1/rubyinstaller-2.4.6-1-x64.7z",
+  "2.4.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.7-1/rubyinstaller-2.4.7-1-x64.7z",
+  "2.4.9": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.9-1/rubyinstaller-2.4.9-1-x64.7z",
+  "2.5.0": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.0-2/rubyinstaller-2.5.0-2-x64.7z",
+  "2.5.1": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.1-2/rubyinstaller-2.5.1-2-x64.7z",
+  "2.5.3": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.3-1/rubyinstaller-2.5.3-1-x64.7z",
+  "2.5.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.5-1/rubyinstaller-2.5.5-1-x64.7z",
+  "2.5.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.6-1/rubyinstaller-2.5.6-1-x64.7z",
+  "2.5.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.7-1/rubyinstaller-2.5.7-1-x64.7z",
+  "2.6.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.0-1/rubyinstaller-2.6.0-1-x64.7z",
+  "2.6.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.1-1/rubyinstaller-2.6.1-1-x64.7z",
+  "2.6.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.2-1/rubyinstaller-2.6.2-1-x64.7z",
+  "2.6.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.3-1/rubyinstaller-2.6.3-1-x64.7z",
+  "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"
+}

windows.js

@@ -5,30 +5,43 @@ const fs = require('fs')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
 const tc = require('@actions/tool-cache')
+const rubyInstallerVersions = require('./windows-versions').versions
 
-const releasesURL = 'https://github.com/oneclick/rubyinstaller2/releases'
+export function getAvailableVersions(platform, engine) {
-
+  if (engine === 'ruby') {
-export async function downloadExtractAndSetPATH(ruby) {
+    return Object.keys(rubyInstallerVersions)
-  const version = ruby.split('-', 2)[1]
+  } else {
-  if (!ruby.startsWith('ruby-') || version.startsWith('2.3')) {
+    return undefined
-    throw new Error(`Only ruby >= 2.4 is supported on Windows currently (input: ${ruby})`)
   }
-  const tag = `RubyInstaller-${version}-1`
+}
-  const base = `${tag.toLowerCase()}-x64`
 
-  const url = `${releasesURL}/download/${tag}/${base}.7z`
+export async function install(platform, ruby) {
+  const version = ruby.split('-', 2)[1]
+  const url = rubyInstallerVersions[version]
   console.log(url)
 
-  const downloadPath = await tc.downloadTool(url)
+  if (!url.endsWith('.7z')) {
-  await exec.exec(`7z x ${downloadPath} -xr!${base}\\share\\doc -oC:\\`)
+    throw new Error('URL should end in .7z')
-  const rubyPrefix = `C:\\${base}`
+  }
+  const base = url.slice(url.lastIndexOf('/') + 1, url.length - '.7z'.length)
 
-  const msys2 = await linkMSYS2()
+  // Extract to SSD, see https://github.com/eregon/use-ruby-action/pull/14
+  const drive = (process.env['GITHUB_WORKSPACE'] || 'C')[0]
+
+  const downloadPath = await tc.downloadTool(url)
+  await exec.exec(`7z x ${downloadPath} -xr!${base}\\share\\doc -o${drive}:\\`)
+  const rubyPrefix = `${drive}:\\${base}`
+
+  const [hostedRuby, msys2] = await linkMSYS2()
   const newPath = setupPath(msys2, rubyPrefix)
   core.exportVariable('PATH', newPath)
 
+  if (version.startsWith('2.3')) {
+    core.exportVariable('SSL_CERT_FILE', `${hostedRuby}\\ssl\\cert.pem`)
+  }
+
   if (!fs.existsSync(`${rubyPrefix}\\bin\\bundle.cmd`)) {
-    await exec.exec(`${rubyPrefix}\\bin\\gem install bundler --no-document`)
+    await exec.exec(`${rubyPrefix}\\bin\\gem install bundler -v "~> 1" --no-document`)
   }
 
   return rubyPrefix
@@ -37,7 +50,7 @@ export async function downloadExtractAndSetPATH(ruby) {
 async function linkMSYS2() {
   const toolCacheVersions = tc.findAllVersions('Ruby')
   toolCacheVersions.sort()
-  if (toolCacheVersions.length == 0) {
+  if (toolCacheVersions.length === 0) {
     throw new Error('Could not find MSYS2 in the toolcache')
   }
   const latestVersion = toolCacheVersions.slice(-1)[0]
@@ -46,7 +59,7 @@ async function linkMSYS2() {
   const hostedMSYS2 = `${latestHostedRuby}\\msys64`
   const msys2 = 'C:\\msys64'
   await exec.exec(`cmd /c mklink /D ${msys2} ${hostedMSYS2}`)
-  return msys2
+  return [latestHostedRuby, msys2]
 }
 
 function setupPath(msys2, rubyPrefix) {
@@ -59,7 +72,7 @@ function setupPath(msys2, rubyPrefix) {
   path = path.filter(e => !e.match(/\bRuby\b/))
 
   // Add MSYS2 in PATH
-  path.unshift(`${msys2}\\mingw64`, `${msys2}\\usr`)
+  path.unshift(`${msys2}\\mingw64\\bin`, `${msys2}\\usr\\bin`)
 
   // Add the downloaded Ruby in PATH
   path.unshift(`${rubyPrefix}\\bin`)

yarn.lock

@@ -108,14 +108,6 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-axios@^0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
-  integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
-  dependencies:
-    follow-redirects "1.5.10"
-    is-buffer "^2.0.2"
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -188,13 +180,6 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-debug@=3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 debug@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -382,13 +367,6 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
   integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
 
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -487,11 +465,6 @@ inquirer@^7.0.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-is-buffer@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -584,11 +557,6 @@ mkdirp@^0.5.1:
   dependencies:
     minimist "0.0.8"
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
 ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"