diff options
| author | Hiroshi SHIBATA <[email protected]> | 2022-11-11 15:05:59 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2022-11-11 17:24:08 +0900 |
| commit | 28611be6ee84ba8eb19e667a70ae129833b98b8b () | |
| tree | d6556c2f06de009ebe7aa19564372f6251ad36e0 | |
| parent | de159c5a855dd53bfd9ce284c9099306724560a7 (diff) | |
Merge RubyGems/Bundler master from ee2f8398324af4bc1b95f7565ce2fda98126e026v3_2_0_preview3
Notes: Merged: https://.com/ruby/ruby/pull/6715
10 files changed, 79 insertions, 14 deletions
@@ -357,7 +357,7 @@ module Bundler "bundle config unset deployment" end msg << "\n\nIf this is a development machine, remove the #{Bundler.default_gemfile} " \ - "freeze \nby running `#{suggested_command}`." end added = [] @@ -79,9 +79,7 @@ module Bundler candidates = if source.is_a?(Source::Path) || !ruby_platform_materializes_to_ruby_platform? target_platform = ruby_platform_materializes_to_ruby_platform? ? platform : local_platform - source.specs.search(Dependency.new(name, version)).select do |spec| - MatchPlatform.platforms_match?(spec.platform, target_platform) - end else source.specs.search(self) end @@ -37,6 +37,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder def build_env build_env = rb_config_env build_env["RUBY_STATIC"] = "true" if ruby_static? && ENV.key?("RUBY_STATIC") build_env end @@ -92,6 +93,9 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder # run on one that isn't the missing libraries will cause the extension # to fail on start. flags += ["-C", "link-arg=-static-libgcc"] end flags @@ -613,6 +613,12 @@ RSpec.describe "bundle update" do expect(err).to match(/You are trying to install in deployment mode after changing.your Gemfile/m). and match(/freeze \nby running `bundle config unset deployment`./m) end end describe "with --source option" do @@ -148,6 +148,38 @@ RSpec.describe "bundle install with specific platforms" do expect(out).to include("Using libv8 8.4.255.0 (universal-darwin)") end it "caches the universal-darwin gem when --all-platforms is passed and properly picks it up on further bundler invocations" do setup_multiplatform_gem gemfile(google_protobuf) @@ -0,0 +1,25 @@ @@ -160,18 +160,18 @@ dependencies = [ [[package]] name = "rb-sys" -version = "0.9.35" source = "registry+https://.com/rust-lang/crates.io-index" -checksum = "2d2bde30824a18f2e68cd1c8004cec16656764c6efc385bc1c7fb4c904b276a5" dependencies = [ "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.35" source = "registry+https://.com/rust-lang/crates.io-index" -checksum = "5ff5d3ba92624df9c66bf0d1f0251d96284f08ac9773b7723d370e3f225c1d38" dependencies = [ "bindgen", "linkify", @@ -7,4 +7,4 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -rb-sys = { version = "0.9.35", features = ["gem"] } @@ -153,18 +153,18 @@ dependencies = [ [[package]] name = "rb-sys" -version = "0.9.35" source = "registry+https://.com/rust-lang/crates.io-index" -checksum = "2d2bde30824a18f2e68cd1c8004cec16656764c6efc385bc1c7fb4c904b276a5" dependencies = [ "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.35" source = "registry+https://.com/rust-lang/crates.io-index" -checksum = "5ff5d3ba92624df9c66bf0d1f0251d96284f08ac9773b7723d370e3f225c1d38" dependencies = [ "bindgen", "linkify", @@ -7,4 +7,4 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -rb-sys = { version = "0.9.35", features = ["gem"] } |