1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

[bundler/bundler] [Package] Always resolve remotely for --all-platforms

https://github.com/bundler/bundler/commit/e45d2272ea
This commit is contained in:
Samuel Giddins 2017-10-20 14:19:32 -05:00 committed by Hiroshi SHIBATA
parent 2ccb3db5fb
commit d761a0f6ff
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
2 changed files with 20 additions and 1 deletions

View file

@ -296,7 +296,7 @@ module Bundler
# returns whether or not a re-resolve was needed
def resolve_if_needed(options)
if !@definition.unlocking? && !options["force"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file?
if !@definition.unlocking? && !options["force"] && !options["all-platforms"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file?
return false if @definition.nothing_changed? && !@definition.missing_specs?
end

View file

@ -203,6 +203,25 @@ RSpec.describe "bundle package" do
bundle "package --all-platforms"
expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
end
it "does not attempt to install gems in without groups" do
install_gemfile! <<-G, forgotten_command_line_options(:without => "wo")
source "file:#{gem_repo1}"
gem "rack"
group :wo do
gem "weakling"
end
G
bundle! :package, "all-platforms" => true
expect(bundled_app("vendor/cache/weakling-0.0.3.gem")).to exist
expect(the_bundle).to include_gem "rack 1.0"
expect(the_bundle).not_to include_gem "weakling"
bundle! :install, forgotten_command_line_options(:without => "wo")
expect(the_bundle).to include_gem "rack 1.0"
expect(the_bundle).not_to include_gem "weakling"
end
end
context "with --frozen" do