From abb6f5c8bc2dba500414e47c6d433d1856749517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 8 Nov 2024 20:17:23 +0100 Subject: [PATCH] [rubygems/rubygems] Fix `bin/rake spec:all` task Only in CI, if two different test runs are started (like `bin/rake spec:all` does), the second one would not install the dev version of Bundler and would fail to start. This commit makes it work the same locally and in CI. https://github.com/rubygems/rubygems/commit/7a5ca6c40f --- spec/bundler/spec_helper.rb | 2 -- spec/bundler/support/builders.rb | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/bundler/spec_helper.rb b/spec/bundler/spec_helper.rb index c6bd786347..81a1a84b20 100644 --- a/spec/bundler/spec_helper.rb +++ b/spec/bundler/spec_helper.rb @@ -87,8 +87,6 @@ RSpec.configure do |config| # Don't wrap output in tests ENV["THOR_COLUMNS"] = "10000" - Spec::Helpers.install_dev_bundler unless ENV["CI"] - extend(Spec::Builders) check_test_gems! diff --git a/spec/bundler/support/builders.rb b/spec/bundler/support/builders.rb index 2dcad26028..5999335b12 100644 --- a/spec/bundler/support/builders.rb +++ b/spec/bundler/support/builders.rb @@ -235,6 +235,8 @@ module Spec FileUtils.rm_rf(base_system_gems) Spec::Rubygems.install_test_deps end + + Helpers.install_dev_bundler unless pristine_system_gem_path.exist? end def update_repo(path, build_compact_index: true)