From d8535b5e7b1a312c2154dc168dda6066c1dc7311 Mon Sep 17 00:00:00 2001 From: Cody Cutrer Date: Wed, 20 Mar 2024 16:54:28 -0600 Subject: [PATCH] really fix syncing bundler version --- lib/bundler/multilock.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bundler/multilock.rb b/lib/bundler/multilock.rb index 94a654d..abf84b2 100644 --- a/lib/bundler/multilock.rb +++ b/lib/bundler/multilock.rb @@ -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 @@ -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)