diff options
| author | Bo Anderson <[email protected]> | 2023-11-17 04:27:24 +0000 |
|---|---|---|
| committer | git <[email protected]> | 2023-11-21 19:11:15 +0000 |
| commit | 57fa69f26f134560e4de2e541a31d187dfc397c7 (patch) | |
| tree | 4aa1fc745caf691b322184ca2dcc896c3dae8918 | |
| parent | 5e16003eec99662cddeb143ff4f8d2e869c7ffc5 (diff) | |
[rubygems/rubygems] Fix invalid platform removal missing adjacent platforms
https://github.com/rubygems/rubygems/commit/4ce66c41a2
| -rw-r--r-- | lib/bundler/definition.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/install/gemfile/specific_platform_spec.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 9ef0abed93..4162e19c5e 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -972,7 +972,7 @@ module Bundler 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/spec/bundler/install/gemfile/specific_platform_spec.rb b/spec/bundler/install/gemfile/specific_platform_spec.rb index 0c9816eaac..4f87cb530d 100644 --- a/spec/bundler/install/gemfile/specific_platform_spec.rb +++ b/spec/bundler/install/gemfile/specific_platform_spec.rb @@ -746,6 +746,7 @@ RSpec.describe "bundle install with specific platforms" do sorbet-static (0.5.10696-x86_64-linux) PLATFORMS + aarch64-linux arm-linux x86_64-linux |