From 44726b41f0861b9287a8377a0435c2ffad8bef09 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Tue, 16 Jan 2024 15:39:21 -0800
Subject: [PATCH] Add ridk option to disable ridk env variables

---
 action.yml      |  2 ++
 dist/index.js   | 10 ++++++----
 index.js        |  4 +++-
 ruby-builder.js |  2 +-
 windows.js      |  4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/action.yml b/action.yml
index e67fe6c34..e38408d91 100644
--- a/action.yml
+++ b/action.yml
@@ -36,6 +36,8 @@ inputs:
       Consider the runner as a self-hosted runner, which means not using prebuilt Ruby binaries which only work
       on GitHub-hosted runners or self-hosted runners with a very similar image to the ones used by GitHub runners.
       The default is to detect this automatically based on the OS, OS version and architecture.
+  ridk:
+    description: 'By default, ridk environment variables are added for Windows. For "none", nothing is done.'
 outputs:
   ruby-prefix:
     description: 'The prefix of the installed ruby'
diff --git a/dist/index.js b/dist/index.js
index 7ba39dc9c..061acedcb 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -64970,7 +64970,7 @@ function getAvailableVersions(platform, engine) {
   return rubyBuilderVersions[engine]
 }
 
-async function install(platform, engine, version) {
+async function install(platform, engine, version, installOptions) {
   let rubyPrefix, inToolCache
   if (common.shouldUseToolCache(engine, version)) {
     inToolCache = common.toolCacheFind(engine, version)
@@ -65208,7 +65208,7 @@ function getAvailableVersions(platform, engine) {
   }
 }
 
-async function install(platform, engine, version) {
+async function install(platform, engine, version, installOptions) {
   const url = rubyInstallerVersions[version]
 
   // The windows-2016 and windows-2019 images have MSYS2 build tools (C:/msys64/usr)
@@ -65257,7 +65257,7 @@ async function install(platform, engine, version) {
   }
 
   const ridk = `${rubyPrefix}\\bin\\ridk.cmd`
-  if (fs.existsSync(ridk)) {
+  if (fs.existsSync(ridk) && installOptions['ridk'] !== 'none') {
     await common.measure('Adding ridk env variables', async () => addRidkEnv(ridk))
   }
 
@@ -65782,8 +65782,10 @@ async function setupRuby(options = {}) {
   const [engine, parsedVersion] = parseRubyEngineAndVersion(inputs['ruby-version'])
 
   let installer
+  const installOptions = {}
   if (platform.startsWith('windows-') && engine === 'ruby' && !common.isSelfHostedRunner()) {
     installer = __nccwpck_require__(3216)
+    installOptions['ridk'] = inputs['ridk']
   } else {
     installer = __nccwpck_require__(9974)
   }
@@ -65801,7 +65803,7 @@ async function setupRuby(options = {}) {
     await (__nccwpck_require__(3216).installJRubyTools)()
   }
 
-  const rubyPrefix = await installer.install(platform, engine, version)
+  const rubyPrefix = await installer.install(platform, engine, version, installOptions)
 
   await common.measure('Print Ruby version', async () =>
     await exec.exec('ruby', ['--version']))
diff --git a/index.js b/index.js
index 9e393de04..437a20160 100644
--- a/index.js
+++ b/index.js
@@ -51,8 +51,10 @@ export async function setupRuby(options = {}) {
   const [engine, parsedVersion] = parseRubyEngineAndVersion(inputs['ruby-version'])
 
   let installer
+  const installOptions = {}
   if (platform.startsWith('windows-') && engine === 'ruby' && !common.isSelfHostedRunner()) {
     installer = require('./windows')
+    installOptions['ridk'] = inputs['ridk']
   } else {
     installer = require('./ruby-builder')
   }
@@ -70,7 +72,7 @@ export async function setupRuby(options = {}) {
     await require('./windows').installJRubyTools()
   }
 
-  const rubyPrefix = await installer.install(platform, engine, version)
+  const rubyPrefix = await installer.install(platform, engine, version, installOptions)
 
   await common.measure('Print Ruby version', async () =>
     await exec.exec('ruby', ['--version']))
diff --git a/ruby-builder.js b/ruby-builder.js
index 35148f563..c2743b1c3 100644
--- a/ruby-builder.js
+++ b/ruby-builder.js
@@ -17,7 +17,7 @@ export function getAvailableVersions(platform, engine) {
   return rubyBuilderVersions[engine]
 }
 
-export async function install(platform, engine, version) {
+export async function install(platform, engine, version, installOptions) {
   let rubyPrefix, inToolCache
   if (common.shouldUseToolCache(engine, version)) {
     inToolCache = common.toolCacheFind(engine, version)
diff --git a/windows.js b/windows.js
index 28789b134..859ec8ae3 100644
--- a/windows.js
+++ b/windows.js
@@ -41,7 +41,7 @@ export function getAvailableVersions(platform, engine) {
   }
 }
 
-export async function install(platform, engine, version) {
+export async function install(platform, engine, version, installOptions) {
   const url = rubyInstallerVersions[version]
 
   // The windows-2016 and windows-2019 images have MSYS2 build tools (C:/msys64/usr)
@@ -90,7 +90,7 @@ export async function install(platform, engine, version) {
   }
 
   const ridk = `${rubyPrefix}\\bin\\ridk.cmd`
-  if (fs.existsSync(ridk)) {
+  if (fs.existsSync(ridk) && installOptions['ridk'] !== 'none') {
     await common.measure('Adding ridk env variables', async () => addRidkEnv(ridk))
   }