Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix invalid platform removal missing adjacent platforms #7170

Merged
merged 1 commit into from
Nov 21, 2023
Merged

Fix invalid platform removal missing adjacent platforms #7170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundler/lib/bundler/definition.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand Down
1 change: 1 addition & 0 deletions bundler/spec/install/gemfile/specific_platform_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,7 @@
sorbet-static (0.5.10696-x86_64-linux)

PLATFORMS
aarch64-linux
arm-linux
x86_64-linux

Expand Down