mirror of
https://github.com/ruby/setup-ruby.git
synced 2026-09-14 06:54:20 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
271876da60 | ||
|
|
5c4fc21c57 | ||
|
|
c8a88df157 |
+18
-8
@@ -2199,20 +2199,23 @@ const inputDefaults = {
|
||||
'working-directory': '.',
|
||||
}
|
||||
|
||||
// entry point when this action is run on its own
|
||||
async function run() {
|
||||
try {
|
||||
const options = {}
|
||||
for (const key in inputDefaults) {
|
||||
options[key] = core.getInput(key)
|
||||
}
|
||||
await setupRuby(options)
|
||||
await setupRuby()
|
||||
} catch (error) {
|
||||
core.setFailed(error.message)
|
||||
}
|
||||
}
|
||||
|
||||
async function setupRuby(options) {
|
||||
const inputs = { ...inputDefaults, ...options }
|
||||
// entry point when this action is run from other actions
|
||||
async function setupRuby(options = {}) {
|
||||
const inputs = { ...options }
|
||||
for (const key in inputDefaults) {
|
||||
if (!inputs.hasOwnProperty(key)) {
|
||||
inputs[key] = core.getInput(key) || inputDefaults[key]
|
||||
}
|
||||
}
|
||||
|
||||
process.chdir(inputs['working-directory'])
|
||||
|
||||
@@ -2235,6 +2238,13 @@ async function setupRuby(options) {
|
||||
|
||||
setupPath(newPathEntries)
|
||||
|
||||
// When setup-ruby is used by other actions, this allows code in them to run
|
||||
// before 'bundle install'. Installed dependencies may require additional
|
||||
// libraries & headers, build tools, etc.
|
||||
if (inputs['afterSetupPathHook'] instanceof Function) {
|
||||
await inputs['afterSetupPathHook']({ platform, rubyPrefix, engine, version })
|
||||
}
|
||||
|
||||
if (inputs['bundler'] !== 'none') {
|
||||
await common.measure('Installing Bundler', async () =>
|
||||
installBundler(inputs['bundler'], platform, rubyPrefix, engine, version))
|
||||
@@ -3083,7 +3093,7 @@ function getVersions(platform) {
|
||||
],
|
||||
"jruby": [
|
||||
"9.1.17.0",
|
||||
"9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1",
|
||||
"9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0",
|
||||
"head"
|
||||
],
|
||||
"truffleruby": [
|
||||
|
||||
@@ -13,20 +13,23 @@ const inputDefaults = {
|
||||
'working-directory': '.',
|
||||
}
|
||||
|
||||
// entry point when this action is run on its own
|
||||
export async function run() {
|
||||
try {
|
||||
const options = {}
|
||||
for (const key in inputDefaults) {
|
||||
options[key] = core.getInput(key)
|
||||
}
|
||||
await setupRuby(options)
|
||||
await setupRuby()
|
||||
} catch (error) {
|
||||
core.setFailed(error.message)
|
||||
}
|
||||
}
|
||||
|
||||
export async function setupRuby(options) {
|
||||
const inputs = { ...inputDefaults, ...options }
|
||||
// entry point when this action is run from other actions
|
||||
export async function setupRuby(options = {}) {
|
||||
const inputs = { ...options }
|
||||
for (const key in inputDefaults) {
|
||||
if (!inputs.hasOwnProperty(key)) {
|
||||
inputs[key] = core.getInput(key) || inputDefaults[key]
|
||||
}
|
||||
}
|
||||
|
||||
process.chdir(inputs['working-directory'])
|
||||
|
||||
@@ -49,6 +52,13 @@ export async function setupRuby(options) {
|
||||
|
||||
setupPath(newPathEntries)
|
||||
|
||||
// When setup-ruby is used by other actions, this allows code in them to run
|
||||
// before 'bundle install'. Installed dependencies may require additional
|
||||
// libraries & headers, build tools, etc.
|
||||
if (inputs['afterSetupPathHook'] instanceof Function) {
|
||||
await inputs['afterSetupPathHook']({ platform, rubyPrefix, engine, version })
|
||||
}
|
||||
|
||||
if (inputs['bundler'] !== 'none') {
|
||||
await common.measure('Installing Bundler', async () =>
|
||||
installBundler(inputs['bundler'], platform, rubyPrefix, engine, version))
|
||||
|
||||
@@ -11,7 +11,7 @@ export function getVersions(platform) {
|
||||
],
|
||||
"jruby": [
|
||||
"9.1.17.0",
|
||||
"9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1",
|
||||
"9.2.9.0", "9.2.10.0", "9.2.11.0", "9.2.11.1", "9.2.12.0",
|
||||
"head"
|
||||
],
|
||||
"truffleruby": [
|
||||
|
||||
Reference in New Issue
Block a user