mirror of
https://github.com/ruby/setup-ruby.git
synced 2026-09-13 14:34:21 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d27f39a5e |
+1
-1
@@ -92559,7 +92559,7 @@ function parseRubyEngineAndVersion(rubyVersion) {
|
|||||||
console.log(`Using ${rubyVersion} as input from file .tool-versions`)
|
console.log(`Using ${rubyVersion} as input from file .tool-versions`)
|
||||||
} else if (rubyVersion === 'mise.toml') { // Read from mise.toml
|
} else if (rubyVersion === 'mise.toml') { // Read from mise.toml
|
||||||
const toolVersions = fs.readFileSync('mise.toml', 'utf8').trim()
|
const toolVersions = fs.readFileSync('mise.toml', 'utf8').trim()
|
||||||
const regexp = /^ruby\s*=\s*['"](.+)['"]$/
|
const regexp = /^\s*ruby\s*=\s*['"]([^'"]+)['"]\s*(?:#.*)?$/
|
||||||
const rubyLine = toolVersions.split(/\r?\n/).filter(e => regexp.test(e))[0]
|
const rubyLine = toolVersions.split(/\r?\n/).filter(e => regexp.test(e))[0]
|
||||||
rubyVersion = rubyLine.match(regexp)[1]
|
rubyVersion = rubyLine.match(regexp)[1]
|
||||||
console.log(`Using ${rubyVersion} as input from file mise.toml`)
|
console.log(`Using ${rubyVersion} as input from file mise.toml`)
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ function parseRubyEngineAndVersion(rubyVersion) {
|
|||||||
console.log(`Using ${rubyVersion} as input from file .tool-versions`)
|
console.log(`Using ${rubyVersion} as input from file .tool-versions`)
|
||||||
} else if (rubyVersion === 'mise.toml') { // Read from mise.toml
|
} else if (rubyVersion === 'mise.toml') { // Read from mise.toml
|
||||||
const toolVersions = fs.readFileSync('mise.toml', 'utf8').trim()
|
const toolVersions = fs.readFileSync('mise.toml', 'utf8').trim()
|
||||||
const regexp = /^ruby\s*=\s*['"](.+)['"]$/
|
const regexp = /^\s*ruby\s*=\s*['"]([^'"]+)['"]\s*(?:#.*)?$/
|
||||||
const rubyLine = toolVersions.split(/\r?\n/).filter(e => regexp.test(e))[0]
|
const rubyLine = toolVersions.split(/\r?\n/).filter(e => regexp.test(e))[0]
|
||||||
rubyVersion = rubyLine.match(regexp)[1]
|
rubyVersion = rubyLine.match(regexp)[1]
|
||||||
console.log(`Using ${rubyVersion} as input from file mise.toml`)
|
console.log(`Using ${rubyVersion} as input from file mise.toml`)
|
||||||
|
|||||||
Reference in New Issue
Block a user