diff options
| -rw-r--r-- | lib/bundler/definition.rb | 9 | ||||
| -rw-r--r-- | spec/bundler/commands/lock_spec.rb | 54 |
2 files changed, 61 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 7ae9a8f8d2..d332fceb54 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -621,14 +621,19 @@ module Bundler end def start_resolution - @platforms |= [local_platform] if @most_specific_non_local_locked_ruby_platform + local_platform_needed_for_resolvability = @most_specific_non_local_locked_ruby_platform && !@platforms.include?(local_platform) + @platforms << local_platform if local_platform_needed_for_resolvability result = SpecSet.new(resolver.start) @resolved_bundler_version = result.find {|spec| spec.name == "bundler" }&.version if @most_specific_non_local_locked_ruby_platform - @platforms.delete(result.incomplete_for_platform?(dependencies, @most_specific_non_local_locked_ruby_platform) ? @most_specific_non_local_locked_ruby_platform : local_platform) + if result.incomplete_for_platform?(dependencies, @most_specific_non_local_locked_ruby_platform) + @platforms.delete(@most_specific_non_local_locked_ruby_platform) + elsif local_platform_needed_for_resolvability + @platforms.delete(local_platform) + end end @platforms = result.add_extra_platforms!(platforms) if should_add_extra_platforms? diff --git a/spec/bundler/commands/lock_spec.rb b/spec/bundler/commands/lock_spec.rb index 3ffe8b90eb..235c2d6756 100644 --- a/spec/bundler/commands/lock_spec.rb +++ b/spec/bundler/commands/lock_spec.rb @@ -1032,6 +1032,60 @@ RSpec.describe "bundle lock" do bundle "lock --add-platform x86_64-linux" end + it "adds platform specific gems as necessary, even when adding the current platform" do + build_repo4 do + build_gem "nokogiri", "1.16.0" + + build_gem "nokogiri", "1.16.0" do |s| + s.platform = "x86_64-linux" + end + end + + gemfile <<-G + source "https://gem.repo4" + + gem "nokogiri" + G + + lockfile <<~L + GEM + remote: https://gem.repo4/ + specs: + nokogiri (1.16.0) + + PLATFORMS + ruby + + DEPENDENCIES + nokogiri + + BUNDLED WITH + #{Bundler::VERSION} + L + + simulate_platform "x86_64-linux" do + bundle "lock --add-platform x86_64-linux" + end + + expect(lockfile).to eq <<~L + GEM + remote: https://gem.repo4/ + specs: + nokogiri (1.16.0) + nokogiri (1.16.0-x86_64-linux) + + PLATFORMS + ruby + x86_64-linux + + DEPENDENCIES + nokogiri + + BUNDLED WITH + #{Bundler::VERSION} + L + end + it "does not crash on conflicting ruby requirements between platform versions in two different gems" do build_repo4 do build_gem "unf_ext", "0.0.8.2" |