Merge pull request #7170 from Bo98/platform-removal-fix

Fix invalid platform removal missing adjacent platforms
rubygems · Nov 21, 2023 · 8c0c3b6 · 8c0c3b6
2 parents fd374c1 + 4ce66c4
commit 8c0c3b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/bundler/lib/bundler/definition.rb b/bundler/lib/bundler/definition.rb
@@ -972,7 +972,7 @@ def additional_base_requirements_for_resolve(resolution_packages, last_resolve)
     def remove_invalid_platforms!(dependencies)
       return if Bundler.frozen_bundle?
 
-      platforms.each do |platform|
+      platforms.reverse_each do |platform|
         next if local_platform == platform ||
                 (@new_platform && platforms.last == platform) ||
                 @path_changes ||

diff --git a/bundler/spec/install/gemfile/specific_platform_spec.rb b/bundler/spec/install/gemfile/specific_platform_spec.rb
@@ -746,6 +746,7 @@
             sorbet-static (0.5.10696-x86_64-linux)
 
         PLATFORMS
+          aarch64-linux
           arm-linux
           x86_64-linux