Move JAVA_HOME setup into install

headius · headius · commit 5c0bbf74310f · 2025-03-12T11:43:15.000-05:00
diff --git a/dist/index.js b/dist/index.js
diff --git a/index.js b/index.js
@@ -79,10 +79,6 @@ export async function setupRuby(options = {}) {
 
   const rubyPrefix = await installer.install(platform, engine, version)
 
-  if (engine === "jruby") {
-    await common.setupJavaHome()
-  }
-
   await common.measure('Print Ruby version', async () =>
     await exec.exec('ruby', ['--version']))
 
diff --git a/ruby-builder.js b/ruby-builder.js
@@ -54,6 +54,11 @@ export async function install(platform, engine, version) {
     await downloadAndExtract(platform, engine, version, rubyPrefix)
   }
 
+  // Ensure JRuby has minimum Java version to run
+  if (engine === "jruby") {
+    await common.setupJavaHome()
+  }
+
   return rubyPrefix
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,11 @@ export async function install(platform, engine, version) {`
`54`	`54`	`await downloadAndExtract(platform, engine, version, rubyPrefix)`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ // Ensure JRuby has minimum Java version to run`
	`58`	`+ if (engine === "jruby") {`
	`59`	`+ await common.setupJavaHome()`
	`60`	`+ }`
	`61`	`+`
`57`	`62`	`return rubyPrefix`
`58`	`63`	`}`
`59`	`64`