summaryrefslogtreecommitdiff
path: root/spec/bundler/support
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2023-03-17 14:18:30 +0100
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2023-11-13 11:06:10 +0900
commit435eb56f6175b7c9a16121ec8441f7492fa9aec5 (patch)
tree086201ded65f06c9f09d057287ce92778fe9abaf /spec/bundler/support
parent59b361aaca0194bd526e32b7053948a49da4e39d (diff)
[rubygems/rubygems] Automatically lock extra ruby platforms
Since we started locking the specific platform in the lockfile, that has created an annoying situation for users that don't develop on Linux. They will create a lockfile on their machines, locking their local platform, for example, darwin. But then that lockfile won't work automatically when deploying to Heroku for example, because the lockfile is frozen and the Linux platform is not included. There's the chance though that resolving against two platforms (Linux + the local platform) won't succeed while resolving for just the current platform will. So, instead, we check other platform specific variants available for the resolution we initially found, and lock those platforms and specs too if they satisfy the resolution. This is only done when generating new lockfiles from scratch, existing lockfiles should keep working as before, and it's only done for "ruby platforms", i.e., not Java or Windows which have their own complexities, and so are excluded. With this change, we expect that MacOS users can bundle locally and deploy to Heroku without needing to do anything special. https://github.com/rubygems/rubygems/commit/5f24f06bc5
Diffstat (limited to 'spec/bundler/support')
-rw-r--r--spec/bundler/support/platforms.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/bundler/support/platforms.rb b/spec/bundler/support/platforms.rb
index 973d34a43a..3289d5e8e2 100644
--- a/spec/bundler/support/platforms.rb
+++ b/spec/bundler/support/platforms.rb
@@ -105,7 +105,7 @@ module Spec
end
def default_locked_platforms
- [local_platform]
+ [local_platform, generic_local_platform]
end
end
end