Unverified Commit ac868c9c authored Jun 29, 2018 by Benjamin Neff

Get processor count with ruby (on linux and mac)

closes #7830

parent c2fa0b1e

Changelog.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		## Refactor

		## Bug fixes
		* Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830)

		## Features

script/configure_bundler

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		# frozen_string_literal: true

		require_relative "../config/bundler_helper"
		require "etc"

		rails_env = BundlerHelper.rails_env
		database = BundlerHelper.database
		@@ -13,7 +14,7 @@ def config(option)
		system("#{File.join(__dir__, '../bin/bundle')} config --local #{option}")
		end

		config("jobs #{`nproc`}")
		config("jobs #{Etc.nprocessors}")
		config("with #{database}")

		if rails_env == "production"