mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[rubygems/rubygems] Fix Ruby platform incorrectly removed on bundle update
https://github.com/rubygems/rubygems/commit/0d321c9e3a
This commit is contained in:
parent
cbcf2dad39
commit
e77c8397c2
2 changed files with 42 additions and 1 deletions
|
@ -888,7 +888,7 @@ module Bundler
|
||||||
Bundler.local_platform == Gem::Platform::RUBY ||
|
Bundler.local_platform == Gem::Platform::RUBY ||
|
||||||
!platforms.include?(Gem::Platform::RUBY) ||
|
!platforms.include?(Gem::Platform::RUBY) ||
|
||||||
(@new_platform && platforms.last == Gem::Platform::RUBY) ||
|
(@new_platform && platforms.last == Gem::Platform::RUBY) ||
|
||||||
!@originally_locked_specs.incomplete_ruby_specs?(dependencies)
|
!@originally_locked_specs.incomplete_ruby_specs?(expand_dependencies(dependencies))
|
||||||
|
|
||||||
remove_platform(Gem::Platform::RUBY)
|
remove_platform(Gem::Platform::RUBY)
|
||||||
add_current_platform
|
add_current_platform
|
||||||
|
|
|
@ -445,6 +445,47 @@ RSpec.describe "bundle install with specific platforms" do
|
||||||
L
|
L
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "does not remove ruby if gems for other platforms, and not present in the lockfile, exist in the Gemfile" do
|
||||||
|
build_repo4 do
|
||||||
|
build_gem "nokogiri", "1.13.8"
|
||||||
|
build_gem "nokogiri", "1.13.8" do |s|
|
||||||
|
s.platform = Gem::Platform.local
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
gemfile <<~G
|
||||||
|
source "#{file_uri_for(gem_repo4)}"
|
||||||
|
|
||||||
|
gem "nokogiri"
|
||||||
|
|
||||||
|
gem "tzinfo", "~> 1.2", platform: :#{not_local_tag}
|
||||||
|
G
|
||||||
|
|
||||||
|
original_lockfile = <<~L
|
||||||
|
GEM
|
||||||
|
remote: #{file_uri_for(gem_repo4)}/
|
||||||
|
specs:
|
||||||
|
nokogiri (1.13.8)
|
||||||
|
nokogiri (1.13.8-#{Gem::Platform.local})
|
||||||
|
|
||||||
|
PLATFORMS
|
||||||
|
#{lockfile_platforms_for([specific_local_platform, "ruby"])}
|
||||||
|
|
||||||
|
DEPENDENCIES
|
||||||
|
nokogiri
|
||||||
|
tzinfo (~> 1.2)
|
||||||
|
|
||||||
|
BUNDLED WITH
|
||||||
|
#{Bundler::VERSION}
|
||||||
|
L
|
||||||
|
|
||||||
|
lockfile original_lockfile
|
||||||
|
|
||||||
|
bundle "lock --update"
|
||||||
|
|
||||||
|
expect(lockfile).to eq(original_lockfile)
|
||||||
|
end
|
||||||
|
|
||||||
it "can fallback to a source gem when platform gems are incompatible with current ruby version" do
|
it "can fallback to a source gem when platform gems are incompatible with current ruby version" do
|
||||||
setup_multiplatform_gem_with_source_gem
|
setup_multiplatform_gem_with_source_gem
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue