From 57fa69f26f134560e4de2e541a31d187dfc397c7 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 17 Nov 2023 04:27:24 +0000 Subject: [PATCH] [rubygems/rubygems] Fix invalid platform removal missing adjacent platforms https://github.com/rubygems/rubygems/commit/4ce66c41a2 --- lib/bundler/definition.rb | 2 +- spec/bundler/install/gemfile/specific_platform_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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