ruby/setup-ruby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try also removing the other case where --force is used

Browse Source
This commit is contained in:
David Rodríguez
2025-07-16 23:02:44 +02:00
committed by Benoit Daloze
parent f66e1124dc
commit 4727905401
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundler.js
+1 -3
View File
@@ -137,13 +137,11 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
} }
const gem = path.join(rubyPrefix, 'bin', 'gem') const gem = path.join(rubyPrefix, 'bin', 'gem')
// and for https://github.com/oracle/truffleruby/issues/2780
const force = engine === 'truffleruby' ? ['--force'] : []
const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length
const bundlerVersionConstraint = versionParts >= 3 ? bundlerVersion : `~> ${bundlerVersion}.0` const bundlerVersionConstraint = versionParts >= 3 ? bundlerVersion : `~> ${bundlerVersion}.0`
await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint]) await exec.exec(gem, ['install', 'bundler', '-v', bundlerVersionConstraint])
return bundlerVersion return bundlerVersion
} }
dist/index.js
Generated Vendored
+1 -3
View File
@@ -151,13 +151,11 @@ async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, p
} }
const gem = path.join(rubyPrefix, 'bin', 'gem') const gem = path.join(rubyPrefix, 'bin', 'gem')
// and for https://github.com/oracle/truffleruby/issues/2780
const force = engine === 'truffleruby' ? ['--force'] : []
const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length
const bundlerVersionConstraint = versionParts >= 3 ? bundlerVersion : `~> ${bundlerVersion}.0` const bundlerVersionConstraint = versionParts >= 3 ? bundlerVersion : `~> ${bundlerVersion}.0`
await exec.exec(gem, ['install', 'bundler', ...force, '-v', bundlerVersionConstraint]) await exec.exec(gem, ['install', 'bundler', '-v', bundlerVersionConstraint])
return bundlerVersion return bundlerVersion
} }