Skip to content

Commit

Permalink
really fix syncing bundler version
Browse files Browse the repository at this point in the history
  • Loading branch information
ccutrer committed Mar 20, 2024
1 parent bb3bde5 commit abd3f06
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/bundler/multilock.rb
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ def after_install_all(install: true)
end
lockfile.instance_variable_set(:@ruby_version, parent_lockfile.ruby_version)
unless lockfile.bundler_version == parent_lockfile.bundler_version
unlocking_bundler = true
unlocking_bundler = parent_lockfile.bundler_version
lockfile.instance_variable_set(:@bundler_version, parent_lockfile.bundler_version)
end

Expand Down Expand Up @@ -492,6 +492,7 @@ def write_lockfile(lockfile_definition,
resolved_remotely = true
end
SharedHelpers.capture_filesystem_access do
definition.instance_variable_set(:@resolved_bundler_version, unlocking_bundler) if unlocking_bundler
if Bundler.gem_version >= Gem::Version.new("2.5.6")
definition.instance_variable_set(:@lockfile, lockfile_definition[:lockfile])
definition.lock(true)
Expand Down

0 comments on commit abd3f06

Please sign in to comment.