You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
73 lines
2.2 KiB
73 lines
2.2 KiB
8 months ago
|
diff --git a/bundler/spec/install/gemfile/specific_platform_spec.rb b/bundler/spec/install/gemfile/specific_platform_spec.rb
|
||
|
|
index a29446305..e35d8bc16 100644
|
||
|
|
--- a/bundler/spec/install/gemfile/specific_platform_spec.rb
|
||
|
|
+++ b/bundler/spec/install/gemfile/specific_platform_spec.rb
|
||
|
|
@@ -104,40 +104,53 @@
|
||
|
|
L
|
||
|
|
end
|
||
|
|
|
||
|
|
- it "still installs the generic RUBY variant if necessary even when running on a legacy lockfile locked only to RUBY" do
|
||
|
|
- build_repo4 do
|
||
|
|
- build_gem "nokogiri", "1.3.10"
|
||
|
|
- build_gem "nokogiri", "1.3.10" do |s|
|
||
|
|
- s.platform = "arm64-darwin"
|
||
|
|
- s.required_ruby_version = "< #{Gem.ruby_version}"
|
||
|
|
+ context "when running on a legacy lockfile locked only to RUBY" do
|
||
|
|
+ around do |example|
|
||
|
|
+ build_repo4 do
|
||
|
|
+ build_gem "nokogiri", "1.3.10"
|
||
|
|
+ build_gem "nokogiri", "1.3.10" do |s|
|
||
|
|
+ s.platform = "arm64-darwin"
|
||
|
|
+ s.required_ruby_version = "< #{Gem.ruby_version}"
|
||
|
|
+ end
|
||
|
|
+
|
||
|
|
+ build_gem "bundler", "2.1.4"
|
||
|
|
end
|
||
|
|
|
||
|
|
- build_gem "bundler", "2.1.4"
|
||
|
|
- end
|
||
|
|
-
|
||
|
|
- gemfile <<~G
|
||
|
|
+ gemfile <<~G
|
||
|
|
source "#{file_uri_for(gem_repo4)}"
|
||
|
|
+
|
||
|
|
gem "nokogiri"
|
||
|
|
- G
|
||
|
|
+ G
|
||
|
|
|
||
|
|
- lockfile <<-L
|
||
|
|
+ lockfile <<-L
|
||
|
|
GEM
|
||
|
|
remote: #{file_uri_for(gem_repo4)}/
|
||
|
|
specs:
|
||
|
|
nokogiri (1.3.10)
|
||
|
|
+
|
||
|
|
PLATFORMS
|
||
|
|
ruby
|
||
|
|
+
|
||
|
|
DEPENDENCIES
|
||
|
|
nokogiri
|
||
|
|
+
|
||
|
|
RUBY VERSION
|
||
|
|
2.5.3p105
|
||
|
|
+
|
||
|
|
BUNDLED WITH
|
||
|
|
2.1.4
|
||
|
|
- L
|
||
|
|
+ L
|
||
|
|
|
||
|
|
- simulate_platform "arm64-darwin-22" do
|
||
|
|
+ simulate_platform "arm64-darwin-22", &example
|
||
|
|
+ end
|
||
|
|
+
|
||
|
|
+ it "still installs the generic RUBY variant if necessary" do
|
||
|
|
bundle "update --bundler", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
|
||
|
|
end
|
||
|
|
+
|
||
|
|
+ it "still installs the generic RUBY variant if necessary, even in frozen mode" do
|
||
|
|
+ bundle "update --bundler", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s, "BUNDLE_FROZEN" => "true" }
|
||
|
|
+ end
|
||
|
|
end
|
||
|
|
|
||
|
|
it "doesn't discard previously installed platform specific gem and fall back to ruby on subsequent bundles" do
|