Fix tc.find() calls to use the proper name on self-hosted

ruby · Mar 5, 2023 · d03a71d · d03a71d
1 parent ddde393
commit d03a71d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/common.js b/common.js
@@ -264,15 +264,18 @@ function getDefaultToolCachePath() {
   }
 }
 
-export function getToolCacheRubyPrefix(platform, engine, version) {
-  const toolCache = getToolCachePath()
-  const name = {
+export function engineToToolCacheName(engine) {
+  return {
     ruby: 'Ruby',
     jruby: 'JRuby',
     truffleruby: 'TruffleRuby',
     "truffleruby+graalvm": 'TruffleRubyGraalVM'
   }[engine]
-  return path.join(toolCache, name, version, os.arch())
+}
+
+export function getToolCacheRubyPrefix(platform, engine, version) {
+  const toolCache = getToolCachePath()
+  return path.join(toolCache, engineToToolCacheName(engine), version, os.arch())
 }
 
 export function toolCacheCompleteFile(toolCacheRubyPrefix) {

diff --git a/dist/index.js b/dist/index.js
diff --git a/ruby-builder.js b/ruby-builder.js
@@ -20,7 +20,7 @@ export function getAvailableVersions(platform, engine) {
 export async function install(platform, engine, version) {
   let rubyPrefix, inToolCache
   if (common.shouldUseToolCache(engine, version)) {
-    inToolCache = tc.find('Ruby', version)
+    inToolCache = tc.find(common.engineToToolCacheName(engine), version)
     if (inToolCache) {
       rubyPrefix = inToolCache
     } else {

diff --git a/windows.js b/windows.js
@@ -49,7 +49,7 @@ export async function install(platform, engine, version) {
 
   let rubyPrefix, inToolCache
   if (common.shouldUseToolCache(engine, version)) {
-    inToolCache = tc.find('Ruby', version)
+    inToolCache = tc.find(common.engineToToolCacheName(engine), version)
     if (inToolCache) {
       rubyPrefix = inToolCache
     } else {