Compare commits

...
3 Commits
Author SHA1 Message Date
David Rodríguez 4727905401 Try also removing the other case where --force is used 2025-07-16 23:02:44 +02:00
David Rodríguez f66e1124dc Don't use --force flag on Windows
It was originally added by https://github.com/ruby/setup-ruby/pull/253,
in order to fix CI. However, now CI passes without it so I assume this
was fixed by rubyinstaller2.

Force actually bypasses dependency constraints so it's actually
installing the latest Bundler in a version of Ruby that's incompatible
with it.
2025-07-16 23:02:44 +02:00
David Rodríguez a0d08243d4 Add workaround for Ruby 3.1 after RubyGems 3.7.0 release 2025-07-16 23:02:44 +02:00
3 changed files with 8 additions and 10 deletions
+1 -4
View File
@@ -137,14 +137,11 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
}
const gem = path.join(rubyPrefix, 'bin', 'gem')
// Workaround for https://github.com/rubygems/rubygems/issues/5245
// and for https://github.com/oracle/truffleruby/issues/2780
const force = ((platform.startsWith('windows-') && engine === 'ruby' && floatVersion >= 3.1) || (engine === 'truffleruby')) ? ['--force'] : []
const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length
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
}
Generated Vendored
+4 -5
View File
@@ -151,14 +151,11 @@ async function installBundler(bundlerVersionInput, rubygemsInputSet, lockFile, p
}
const gem = path.join(rubyPrefix, 'bin', 'gem')
// Workaround for https://github.com/rubygems/rubygems/issues/5245
// and for https://github.com/oracle/truffleruby/issues/2780
const force = ((platform.startsWith('windows-') && engine === 'ruby' && floatVersion >= 3.1) || (engine === 'truffleruby')) ? ['--force'] : []
const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length
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
}
@@ -71454,8 +71451,10 @@ async function rubygemsLatest(gem, platform, engine, rubyVersion) {
const floatVersion = common.floatVersion(rubyVersion)
if (common.isHeadVersion(rubyVersion)) {
console.log('Ruby master builds use included RubyGems')
} else if (floatVersion >= 3.1) {
} else if (floatVersion >= 3.2) {
await exec.exec(gem, ['update', '--system'])
} else if (floatVersion >= 3.1) {
await exec.exec(gem, ['update', '--system', '3.6.9'])
} else if (floatVersion >= 3.0) {
await exec.exec(gem, ['update', '--system', '3.5.23'])
} else if (floatVersion >= 2.6) {
+3 -1
View File
@@ -39,8 +39,10 @@ async function rubygemsLatest(gem, platform, engine, rubyVersion) {
const floatVersion = common.floatVersion(rubyVersion)
if (common.isHeadVersion(rubyVersion)) {
console.log('Ruby master builds use included RubyGems')
} else if (floatVersion >= 3.1) {
} else if (floatVersion >= 3.2) {
await exec.exec(gem, ['update', '--system'])
} else if (floatVersion >= 3.1) {
await exec.exec(gem, ['update', '--system', '3.6.9'])
} else if (floatVersion >= 3.0) {
await exec.exec(gem, ['update', '--system', '3.5.23'])
} else if (floatVersion >= 2.6) {