Allow bundler: none + bundle-cache: true to use the Bundler shipped w…

…ith that Ruby + the cache
ruby · Jan 27, 2022 · fabf251 · fabf251
1 parent 51c0d59
commit fabf251
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/index.js b/index.js
@@ -78,16 +78,17 @@ export async function setupRuby(options = {}) {
     await inputs['afterSetupPathHook']({ platform, rubyPrefix, engine, version })
   }
 
-  if (inputs['bundler'] !== 'none') {
-    const [gemfile, lockFile] = bundler.detectGemfiles()
+  const [gemfile, lockFile] = bundler.detectGemfiles()
+  let bundlerVersion = "unknown"
 
-    const bundlerVersion = await common.measure('Installing Bundler', async () =>
+  if (inputs['bundler'] !== 'none') {
+    bundlerVersion = await common.measure('Installing Bundler', async () =>
       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']))
-    }
+  if (inputs['bundler-cache'] === 'true') {
+    await common.measure('bundle install', async () =>
+      bundler.bundleInstall(gemfile, lockFile, platform, engine, version, bundlerVersion, inputs['cache-version']))
   }
 
   core.setOutput('ruby-prefix', rubyPrefix)