Test 3.1 too

* Previously the commit was used.

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11.0, windows-2016, windows-2019 ]
-        ruby: [ 1.9, '2.0', 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, '3.0', ruby-head, jruby, jruby-head, truffleruby, truffleruby-head ]
+        ruby: [ 1.9, '2.0', 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, ruby-head, jruby, jruby-head, truffleruby, truffleruby-head, truffleruby+graalvm, truffleruby+graalvm-head ]
         include:
         - { os: windows-2016, ruby: mingw }
         - { os: windows-2019, ruby: mingw }
@@ -26,10 +26,14 @@ jobs:
         - { os: windows-2016, ruby: debug }
         - { os: windows-2016, ruby: truffleruby }
         - { os: windows-2016, ruby: truffleruby-head }
+        - { os: windows-2016, ruby: truffleruby+graalvm }
+        - { os: windows-2016, ruby: truffleruby+graalvm-head }
         - { os: windows-2019, ruby: 1.9 }
         - { os: windows-2019, ruby: debug }
         - { os: windows-2019, ruby: truffleruby }
         - { os: windows-2019, ruby: truffleruby-head }
+        - { os: windows-2019, ruby: truffleruby+graalvm }
+        - { os: windows-2019, ruby: truffleruby+graalvm-head }
 
     name: ${{ matrix.os }} ${{ matrix.ruby }}
     runs-on: ${{ matrix.os }}

CONTRIBUTING.md

@@ -19,3 +19,7 @@ It is recommended to add this as a `git` `pre-commit` hook:
 ```bash
 $ cp pre-commit .git/hooks/pre-commit
 ```
+
+## Adding a new Ruby version
+
+Add the new version in `ruby-builder-versions.js` and update the README.

README.md

@@ -14,9 +14,10 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 
 | Interpreter | Versions |
 | ----------- | -------- |
-| `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.0.2, head, debug, mingw, mswin |
+| `ruby` | 1.9.3, 2.0.0, 2.1.9, 2.2, all versions from 2.3.0 until 3.1.0-preview1, head, debug, mingw, mswin |
-| `jruby` | 9.1.17.0, 9.2.9.0 - 9.2.19.0, head |
+| `jruby` | 9.1.17.0 - 9.3.1.0, head |
-| `truffleruby` | 19.3.0 - 21.2.0, head |
+| `truffleruby` | 19.3.0 - 21.3.0, head |
+| `truffleruby+graalvm` | 21.2.0 - 21.3.0, head |
 
 `ruby-debug` is the same as `ruby-head` but with assertions enabled (`-DRUBY_DEBUG=1`).  
 On Windows, `mingw` and `mswin` are `ruby-head` builds using the MSYS2/MinGW and the MSVC toolchains respectively.
@@ -46,8 +47,9 @@ The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ru
 and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).
 `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)
+`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).
+`truffleruby-head` is generated by [truffleruby-dev-builder](https://github.com/ruby/truffleruby-dev-builder)
+and `truffleruby+graalvm` is generated by [graalvm-ce-dev-builds](https://github.com/graalvm/graalvm-ce-dev-builds).
 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.
 

bundler.js

@@ -40,12 +40,12 @@ function readBundledWithFromGemfileLock(lockFile) {
   return null
 }
 
-async function afterLockFile(lockFile, platform, engine) {
+async function afterLockFile(lockFile, platform, engine, rubyVersion) {
-  if (engine === 'truffleruby' && platform.startsWith('ubuntu-')) {
+  if (engine.startsWith('truffleruby') && common.floatVersion(rubyVersion) < 21.1 && platform.startsWith('ubuntu-')) {
     const contents = fs.readFileSync(lockFile, 'utf8')
     if (contents.includes('nokogiri')) {
-      await common.measure('Installing libxml2-dev libxslt-dev, required to install nokogiri on TruffleRuby', async () =>
+      await common.measure('Installing libxml2-dev libxslt-dev, required to install nokogiri on TruffleRuby < 21.1', async () =>
-          exec.exec('sudo', ['apt-get', '-yqq', 'install', 'libxml2-dev', 'libxslt-dev'], { silent: true }))
+        exec.exec('sudo', ['apt-get', '-yqq', 'install', 'libxml2-dev', 'libxslt-dev'], { silent: true }))
     }
   }
 }
@@ -74,7 +74,7 @@ export async function installBundler(bundlerVersionInput, lockFile, platform, ru
   if (engine === 'ruby' && common.floatVersion(rubyVersion) <= 2.2) {
     console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2')
     bundlerVersion = '1'
-  } else if (engine === 'ruby' && rubyVersion.match(/^2\.3\.[01]/)) {
+  } else if (engine === 'ruby' && /^2\.3\.[01]/.test(rubyVersion)) {
     console.log('Ruby 2.3.0 and 2.3.1 have shipped with an old rubygems that only works with Bundler 1')
     bundlerVersion = '1'
   } else if (engine === 'jruby' && rubyVersion.startsWith('9.1')) { // JRuby 9.1 targets Ruby 2.3, treat it the same
@@ -86,11 +86,11 @@ export async function installBundler(bundlerVersionInput, lockFile, platform, ru
     // Avoid installing a newer Bundler version for head versions as it might not work.
     // For releases, even if they ship with Bundler 2 we install the latest Bundler.
     console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
-  } else if (engine === 'truffleruby' && common.isBundler1Default(engine, rubyVersion) && bundlerVersion.startsWith('1')) {
+  } else if (engine.startsWith('truffleruby') && common.isBundler1Default(engine, rubyVersion) && bundlerVersion.startsWith('1')) {
     console.log(`Using Bundler 1 shipped with ${engine}-${rubyVersion}`)
   } else {
     const gem = path.join(rubyPrefix, 'bin', 'gem')
-    const bundlerVersionConstraint = bundlerVersion.match(/^\d+\.\d+\.\d+/) ? bundlerVersion : `~> ${bundlerVersion}`
+    const bundlerVersionConstraint = /^\d+\.\d+\.\d+/.test(bundlerVersion) ? bundlerVersion : `~> ${bundlerVersion}`
     await exec.exec(gem, ['install', 'bundler', '-v', bundlerVersionConstraint])
   }
 
@@ -126,7 +126,7 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
     await exec.exec('bundle', ['lock'], envOptions)
   }
 
-  await afterLockFile(lockFile, platform, engine)
+  await afterLockFile(lockFile, platform, engine, rubyVersion)
 
   // cache key
   const paths = [cachePath]
@@ -183,17 +183,21 @@ async function computeBaseKey(platform, engine, version, lockFile, cacheVersion)
   const cacheVersionSuffix = DEFAULT_CACHE_VERSION === cacheVersion ? '' : `-cachever:${cacheVersion}`
   let key = `setup-ruby-bundler-cache-v3-${platform}-${engine}-${version}${cacheVersionSuffix}`
 
-  if (engine !== 'jruby' && common.isHeadVersion(version)) {
+  if (common.isHeadVersion(version)) {
-    let revision = '';
+    if (engine !== 'jruby') {
-    await exec.exec('ruby', ['-e', 'print RUBY_REVISION'], {
+      // CRuby dev versions do not change the ABI version when the ABI changes, so use the commit as the ABI version
-      silent: true,
+      let print_abi = engine === 'ruby' ? 'print RUBY_REVISION' : "print RbConfig::CONFIG['ruby_version']"
-      listeners: {
+      let abi = ''
-        stdout: (data) => {
+      await exec.exec('ruby', ['-e', print_abi], {
-          revision += data.toString();
+        silent: true,
+        listeners: {
+          stdout: (data) => {
+            abi += data.toString();
+          }
         }
-      }
+      });
-    });
+      key += `-ABI-${abi}`
-    key += `-revision-${revision}`
+    }
   }
 
   key += `-${lockFile}`

common.js

@@ -62,7 +62,7 @@ export function isBundler1Default(engine, rubyVersion) {
 export function isBundler2Default(engine, rubyVersion) {
   if (engine === 'ruby') {
     return floatVersion(rubyVersion) >= 2.7
-  } else if (engine === 'truffleruby') {
+  } else if (engine.startsWith('truffleruby')) {
     return floatVersion(rubyVersion) >= 21.0
   } else if (engine === 'jruby') {
     return floatVersion(rubyVersion) >= 9.3

dist/index.js

@@ -54,12 +54,12 @@ function readBundledWithFromGemfileLock(lockFile) {
   return null
 }
 
-async function afterLockFile(lockFile, platform, engine) {
+async function afterLockFile(lockFile, platform, engine, rubyVersion) {
-  if (engine === 'truffleruby' && platform.startsWith('ubuntu-')) {
+  if (engine.startsWith('truffleruby') && common.floatVersion(rubyVersion) < 21.1 && platform.startsWith('ubuntu-')) {
     const contents = fs.readFileSync(lockFile, 'utf8')
     if (contents.includes('nokogiri')) {
-      await common.measure('Installing libxml2-dev libxslt-dev, required to install nokogiri on TruffleRuby', async () =>
+      await common.measure('Installing libxml2-dev libxslt-dev, required to install nokogiri on TruffleRuby < 21.1', async () =>
-          exec.exec('sudo', ['apt-get', '-yqq', 'install', 'libxml2-dev', 'libxslt-dev'], { silent: true }))
+        exec.exec('sudo', ['apt-get', '-yqq', 'install', 'libxml2-dev', 'libxslt-dev'], { silent: true }))
     }
   }
 }
@@ -88,7 +88,7 @@ async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefi
   if (engine === 'ruby' && common.floatVersion(rubyVersion) <= 2.2) {
     console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2')
     bundlerVersion = '1'
-  } else if (engine === 'ruby' && rubyVersion.match(/^2\.3\.[01]/)) {
+  } else if (engine === 'ruby' && /^2\.3\.[01]/.test(rubyVersion)) {
     console.log('Ruby 2.3.0 and 2.3.1 have shipped with an old rubygems that only works with Bundler 1')
     bundlerVersion = '1'
   } else if (engine === 'jruby' && rubyVersion.startsWith('9.1')) { // JRuby 9.1 targets Ruby 2.3, treat it the same
@@ -100,11 +100,11 @@ async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefi
     // Avoid installing a newer Bundler version for head versions as it might not work.
     // For releases, even if they ship with Bundler 2 we install the latest Bundler.
     console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
-  } else if (engine === 'truffleruby' && common.isBundler1Default(engine, rubyVersion) && bundlerVersion.startsWith('1')) {
+  } else if (engine.startsWith('truffleruby') && common.isBundler1Default(engine, rubyVersion) && bundlerVersion.startsWith('1')) {
     console.log(`Using Bundler 1 shipped with ${engine}-${rubyVersion}`)
   } else {
     const gem = path.join(rubyPrefix, 'bin', 'gem')
-    const bundlerVersionConstraint = bundlerVersion.match(/^\d+\.\d+\.\d+/) ? bundlerVersion : `~> ${bundlerVersion}`
+    const bundlerVersionConstraint = /^\d+\.\d+\.\d+/.test(bundlerVersion) ? bundlerVersion : `~> ${bundlerVersion}`
     await exec.exec(gem, ['install', 'bundler', '-v', bundlerVersionConstraint])
   }
 
@@ -140,7 +140,7 @@ async function bundleInstall(gemfile, lockFile, platform, engine, rubyVersion, b
     await exec.exec('bundle', ['lock'], envOptions)
   }
 
-  await afterLockFile(lockFile, platform, engine)
+  await afterLockFile(lockFile, platform, engine, rubyVersion)
 
   // cache key
   const paths = [cachePath]
@@ -197,17 +197,21 @@ async function computeBaseKey(platform, engine, version, lockFile, cacheVersion)
   const cacheVersionSuffix = DEFAULT_CACHE_VERSION === cacheVersion ? '' : `-cachever:${cacheVersion}`
   let key = `setup-ruby-bundler-cache-v3-${platform}-${engine}-${version}${cacheVersionSuffix}`
 
-  if (engine !== 'jruby' && common.isHeadVersion(version)) {
+  if (common.isHeadVersion(version)) {
-    let revision = '';
+    if (engine !== 'jruby') {
-    await exec.exec('ruby', ['-e', 'print RUBY_REVISION'], {
+      // CRuby dev versions do not change the ABI version when the ABI changes, so use the commit as the ABI version
-      silent: true,
+      let print_abi = engine === 'ruby' ? 'print RUBY_REVISION' : "print RbConfig::CONFIG['ruby_version']"
-      listeners: {
+      let abi = ''
-        stdout: (data) => {
+      await exec.exec('ruby', ['-e', print_abi], {
-          revision += data.toString();
+        silent: true,
+        listeners: {
+          stdout: (data) => {
+            abi += data.toString();
+          }
         }
-      }
+      });
-    });
+      key += `-ABI-${abi}`
-    key += `-revision-${revision}`
+    }
   }
 
   key += `-${lockFile}`
@@ -304,7 +308,7 @@ function isBundler1Default(engine, rubyVersion) {
 function isBundler2Default(engine, rubyVersion) {
   if (engine === 'ruby') {
     return floatVersion(rubyVersion) >= 2.7
-  } else if (engine === 'truffleruby') {
+  } else if (engine.startsWith('truffleruby')) {
     return floatVersion(rubyVersion) >= 21.0
   } else if (engine === 'jruby') {
     return floatVersion(rubyVersion) >= 9.3
@@ -58773,17 +58777,23 @@ function getVersions(platform) {
       "2.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5", "2.6.6", "2.6.7", "2.6.8",
       "2.7.0", "2.7.1", "2.7.2", "2.7.3", "2.7.4",
       "3.0.0-preview1", "3.0.0-preview2", "3.0.0-rc1", "3.0.0", "3.0.1", "3.0.2",
-      "head", "debug",
+      "3.1.0-preview1",
+      "head", "debug"
     ],
     "jruby": [
       "9.1.17.0",
-      "9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0", "9.2.13.0", "9.2.14.0", "9.2.15.0", "9.2.16.0", "9.2.17.0", "9.2.18.0", "9.2.19.0",
+      "9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0", "9.2.13.0", "9.2.14.0", "9.2.15.0", "9.2.16.0", "9.2.17.0", "9.2.18.0", "9.2.19.0", "9.2.20.0",
+      "9.3.0.0", "9.3.1.0",
       "head"
     ],
     "truffleruby": [
       "19.3.0", "19.3.1",
       "20.0.0", "20.1.0", "20.2.0", "20.3.0",
-      "21.0.0", "21.1.0", "21.2.0",
+      "21.0.0", "21.1.0", "21.2.0", "21.2.0.1", "21.3.0",
+      "head"
+    ],
+    "truffleruby+graalvm": [
+      "21.2.0", "21.3.0",
       "head"
     ]
   }
@@ -58840,19 +58850,43 @@ async function install(platform, engine, version) {
   common.setupPath([path.join(rubyPrefix, 'bin')])
 
   if (!inToolCache) {
-    await downloadAndExtract(platform, engine, version, rubyPrefix);
+    await preparePrefix(rubyPrefix)
+    if (engine === 'truffleruby+graalvm') {
+      await installWithRubyBuild(engine, version, rubyPrefix)
+    } else {
+      await downloadAndExtract(platform, engine, version, rubyPrefix)
+    }
   }
 
   return rubyPrefix
 }
 
-async function downloadAndExtract(platform, engine, version, rubyPrefix) {
+async function preparePrefix(rubyPrefix) {
   const parentDir = path.dirname(rubyPrefix)
 
   await io.rmRF(rubyPrefix)
   if (!(fs.existsSync(parentDir) && fs.statSync(parentDir).isDirectory())) {
     await io.mkdirP(parentDir)
   }
+}
+
+async function installWithRubyBuild(engine, version, rubyPrefix) {
+  const tmp = process.env['RUNNER_TEMP'] || os.tmpdir()
+  const rubyBuildDir = path.join(tmp, 'ruby-build-for-setup-ruby')
+  await common.measure('Cloning ruby-build', async () => {
+    await exec.exec('git', ['clone', 'https://github.com/rbenv/ruby-build.git', rubyBuildDir])
+  })
+
+  const rubyName = `${engine}-${version === 'head' ? 'dev' : version}`
+  await common.measure(`Installing ${engine}-${version} with ruby-build`, async () => {
+    await exec.exec(`${rubyBuildDir}/bin/ruby-build`, [rubyName, rubyPrefix])
+  })
+
+  await io.rmRF(rubyBuildDir)
+}
+
+async function downloadAndExtract(platform, engine, version, rubyPrefix) {
+  const parentDir = path.dirname(rubyPrefix)
 
   const downloadPath = await common.measure('Downloading Ruby', async () => {
     const url = getDownloadURL(platform, engine, version)
@@ -59098,7 +59132,7 @@ function addVCVARSEnv() {
   let newEnv = new Map()
   let cmd = `cmd.exe /c "${vcVars} && set"`
   let newSet = cp.execSync(cmd).toString().trim().split(/\r?\n/)
-  newSet = newSet.filter(line => line.match(/\S=\S/))
+  newSet = newSet.filter(line => /\S=\S/.test(line))
   newSet.forEach(s => {
     let [k,v] = common.partition(s, '=')
     newEnv.set(k,v)
@@ -59444,11 +59478,11 @@ async function setupRuby(options = {}) {
     const [gemfile, lockFile] = bundler.detectGemfiles()
 
     const bundlerVersion = await common.measure('Installing Bundler', async () =>
-        bundler.installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
+      bundler.installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
 
     if (inputs['bundler-cache'] === 'true') {
       await common.measure('bundle install', async () =>
-          bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
+        bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
     }
   }
 
@@ -59471,13 +59505,13 @@ function parseRubyEngineAndVersion(rubyVersion) {
     console.log(`Using ${rubyVersion} as input from file .ruby-version`)
   } else if (rubyVersion === '.tool-versions') { // Read from .tool-versions
     const toolVersions = fs.readFileSync('.tool-versions', 'utf8').trim()
-    const rubyLine = toolVersions.split(/\r?\n/).filter(e => e.match(/^ruby\s/))[0]
+    const rubyLine = toolVersions.split(/\r?\n/).filter(e => /^ruby\s/.test(e))[0]
     rubyVersion = rubyLine.match(/^ruby\s+(.+)$/)[1]
     console.log(`Using ${rubyVersion} as input from file .tool-versions`)
   }
 
   let engine, version
-  if (rubyVersion.match(/^(\d+)/) || common.isHeadVersion(rubyVersion)) { // X.Y.Z => ruby-X.Y.Z
+  if (/^(\d+)/.test(rubyVersion) || common.isHeadVersion(rubyVersion)) { // X.Y.Z => ruby-X.Y.Z
     engine = 'ruby'
     version = rubyVersion
   } else if (!rubyVersion.includes('-')) { // myruby -> myruby-stableVersion

index.js

@@ -64,11 +64,11 @@ export async function setupRuby(options = {}) {
     const [gemfile, lockFile] = bundler.detectGemfiles()
 
     const bundlerVersion = await common.measure('Installing Bundler', async () =>
-        bundler.installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
+      bundler.installBundler(inputs['bundler'], lockFile, platform, rubyPrefix, engine, version))
 
     if (inputs['bundler-cache'] === 'true') {
       await common.measure('bundle install', async () =>
-          bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
+        bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
     }
   }
 
@@ -91,13 +91,13 @@ function parseRubyEngineAndVersion(rubyVersion) {
     console.log(`Using ${rubyVersion} as input from file .ruby-version`)
   } else if (rubyVersion === '.tool-versions') { // Read from .tool-versions
     const toolVersions = fs.readFileSync('.tool-versions', 'utf8').trim()
-    const rubyLine = toolVersions.split(/\r?\n/).filter(e => e.match(/^ruby\s/))[0]
+    const rubyLine = toolVersions.split(/\r?\n/).filter(e => /^ruby\s/.test(e))[0]
     rubyVersion = rubyLine.match(/^ruby\s+(.+)$/)[1]
     console.log(`Using ${rubyVersion} as input from file .tool-versions`)
   }
 
   let engine, version
-  if (rubyVersion.match(/^(\d+)/) || common.isHeadVersion(rubyVersion)) { // X.Y.Z => ruby-X.Y.Z
+  if (/^(\d+)/.test(rubyVersion) || common.isHeadVersion(rubyVersion)) { // X.Y.Z => ruby-X.Y.Z
     engine = 'ruby'
     version = rubyVersion
   } else if (!rubyVersion.includes('-')) { // myruby -> myruby-stableVersion

ruby-builder-versions.js

@@ -11,17 +11,23 @@ export function getVersions(platform) {
       "2.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5", "2.6.6", "2.6.7", "2.6.8",
       "2.7.0", "2.7.1", "2.7.2", "2.7.3", "2.7.4",
       "3.0.0-preview1", "3.0.0-preview2", "3.0.0-rc1", "3.0.0", "3.0.1", "3.0.2",
-      "head", "debug",
+      "3.1.0-preview1",
+      "head", "debug"
     ],
     "jruby": [
       "9.1.17.0",
-      "9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0", "9.2.13.0", "9.2.14.0", "9.2.15.0", "9.2.16.0", "9.2.17.0", "9.2.18.0", "9.2.19.0",
+      "9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0", "9.2.13.0", "9.2.14.0", "9.2.15.0", "9.2.16.0", "9.2.17.0", "9.2.18.0", "9.2.19.0", "9.2.20.0",
+      "9.3.0.0", "9.3.1.0",
       "head"
     ],
     "truffleruby": [
       "19.3.0", "19.3.1",
       "20.0.0", "20.1.0", "20.2.0", "20.3.0",
-      "21.0.0", "21.1.0", "21.2.0",
+      "21.0.0", "21.1.0", "21.2.0", "21.2.0.1", "21.3.0",
+      "head"
+    ],
+    "truffleruby+graalvm": [
+      "21.2.0", "21.3.0",
       "head"
     ]
   }

ruby-builder.js

@@ -35,19 +35,43 @@ export async function install(platform, engine, version) {
   common.setupPath([path.join(rubyPrefix, 'bin')])
 
   if (!inToolCache) {
-    await downloadAndExtract(platform, engine, version, rubyPrefix);
+    await preparePrefix(rubyPrefix)
+    if (engine === 'truffleruby+graalvm') {
+      await installWithRubyBuild(engine, version, rubyPrefix)
+    } else {
+      await downloadAndExtract(platform, engine, version, rubyPrefix)
+    }
   }
 
   return rubyPrefix
 }
 
-async function downloadAndExtract(platform, engine, version, rubyPrefix) {
+async function preparePrefix(rubyPrefix) {
   const parentDir = path.dirname(rubyPrefix)
 
   await io.rmRF(rubyPrefix)
   if (!(fs.existsSync(parentDir) && fs.statSync(parentDir).isDirectory())) {
     await io.mkdirP(parentDir)
   }
+}
+
+async function installWithRubyBuild(engine, version, rubyPrefix) {
+  const tmp = process.env['RUNNER_TEMP'] || os.tmpdir()
+  const rubyBuildDir = path.join(tmp, 'ruby-build-for-setup-ruby')
+  await common.measure('Cloning ruby-build', async () => {
+    await exec.exec('git', ['clone', 'https://github.com/rbenv/ruby-build.git', rubyBuildDir])
+  })
+
+  const rubyName = `${engine}-${version === 'head' ? 'dev' : version}`
+  await common.measure(`Installing ${engine}-${version} with ruby-build`, async () => {
+    await exec.exec(`${rubyBuildDir}/bin/ruby-build`, [rubyName, rubyPrefix])
+  })
+
+  await io.rmRF(rubyBuildDir)
+}
+
+async function downloadAndExtract(platform, engine, version, rubyPrefix) {
+  const parentDir = path.dirname(rubyPrefix)
 
   const downloadPath = await common.measure('Downloading Ruby', async () => {
     const url = getDownloadURL(platform, engine, version)

windows.js

@@ -134,7 +134,7 @@ export function addVCVARSEnv() {
   let newEnv = new Map()
   let cmd = `cmd.exe /c "${vcVars} && set"`
   let newSet = cp.execSync(cmd).toString().trim().split(/\r?\n/)
-  newSet = newSet.filter(line => line.match(/\S=\S/))
+  newSet = newSet.filter(line => /\S=\S/.test(line))
   newSet.forEach(s => {
     let [k,v] = common.partition(s, '=')
     newEnv.set(k,v)