summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2020-06-12 18:47:53 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-06-18 19:14:15 +0900
commitc5ee078c5f8461ab3b377527440c889df6726d90 (patch)
tree6805a46b431eaceb9ed192f3c3e663f8de8dc49f /lib
parent7aa6fec45f70cb83876ff22940f22078f0f1e95e (diff)
[rubygems/rubygems] Disable parallel installation by default on Windows
Since we enabled parallel installation by default, we've fixed all the issues related to it that have come up, except for a Windows issue that we haven't yet figured out. This issue is hit by our specs on a daily basis and there's no reason to believe that it won't be hit by end users in a similar way. So, both to stop the testing flakyness and to prevent regressions in the default behavior on Windows, I'd rather leave the default as it was before on Windows for now. https://github.com/rubygems/rubygems/commit/5d8ab57131
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3212
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/installer.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 874aac75b6..44ef396871 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -202,7 +202,14 @@ module Bundler
return jobs
end
- Bundler.settings[:jobs] || processor_count
+ if jobs = Bundler.settings[:jobs]
+ return jobs
+ end
+
+ # Parallelization has some issues on Windows, so it's not yet the default
+ return 1 if Gem.win_platform?
+
+ processor_count
end
def processor_count