diff options
| author | David RodrÃguez <[email protected]> | 2023-03-17 14:18:30 +0100 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2023-11-13 11:06:10 +0900 |
| commit | 435eb56f6175b7c9a16121ec8441f7492fa9aec5 () | |
| tree | 086201ded65f06c9f09d057287ce92778fe9abaf /lib | |
| parent | 59b361aaca0194bd526e32b7053948a49da4e39d (diff) | |
[rubygems/rubygems] Automatically lock extra ruby platforms
Since we started locking the specific platform in the lockfile, that has created an annoying situation for users that don't develop on Linux. They will create a lockfile on their machines, locking their local platform, for example, darwin. But then that lockfile won't work automatically when deploying to Heroku for example, because the lockfile is frozen and the Linux platform is not included. There's the chance though that resolving against two platforms (Linux + the local platform) won't succeed while resolving for just the current platform will. So, instead, we check other platform specific variants available for the resolution we initially found, and lock those platforms and specs too if they satisfy the resolution. This is only done when generating new lockfiles from scratch, existing lockfiles should keep working as before, and it's only done for "ruby platforms", i.e., not Java or Windows which have their own complexities, and so are excluded. With this change, we expect that MacOS users can bundle locally and deploy to Heroku without needing to do anything special. https://.com/rubygems/rubygems/commit/5f24f06bc5
| -rw-r--r-- | lib/bundler/definition.rb | 15 | ||||
| -rw-r--r-- | lib/bundler/spec_set.rb | 38 |
2 files changed, 50 insertions, 3 deletions
@@ -84,7 +84,7 @@ module Bundler @new_platform = nil @removed_platform = nil - if lockfile && File.exist?(lockfile) @lockfile_contents = Bundler.read_file(lockfile) @locked_gems = LockfileParser.new(@lockfile_contents) @locked_platforms = @locked_gems.platforms @@ -302,6 +302,10 @@ module Bundler end end def spec_git_paths sources.git_sources.map {|s| File.realpath(s.path) if File.exist?(s.path) }.compact end @@ -491,6 +495,10 @@ module Bundler private def resolver @resolver ||= Resolver.new(resolution_packages, gem_version_promoter) end @@ -567,11 +575,12 @@ module Bundler end def start_resolution - result = resolver.start @resolved_bundler_version = result.find {|spec| spec.name == "bundler" }&.version - SpecSet.new(SpecSet.new(result).for(dependencies, false, @platforms)) end def precompute_source_requirements_for_indirect_dependencies? @@ -52,6 +52,44 @@ module Bundler specs.uniq end def [](key) key = key.name if key.respond_to?(:name) lookup[key].reverse |