Browse Source

CI - fix to use only 1 CPU core for Web Debug build config.

Yao Wei Tjong 姚伟忠 5 years ago
parent
commit
4be250bfde
1 changed files with 9 additions and 6 deletions
  1. 9 6
      rakefile

+ 9 - 6
rakefile

@@ -189,6 +189,7 @@ task :ci do
   case ENV['PLATFORM']
   case ENV['PLATFORM']
   when 'web'
   when 'web'
     ENV['EMSCRIPTEN_SHARE_DATA'] = '1'
     ENV['EMSCRIPTEN_SHARE_DATA'] = '1'
+    $max_jobs = 1 if ENV['BUILD_TYPE'] == 'dbg'
     $publish_task = 'ci_publish_web'
     $publish_task = 'ci_publish_web'
   else
   else
     # Do nothing
     # Do nothing
@@ -264,18 +265,20 @@ task :init do
   Rake::Task[:ci].invoke if ENV['CI']
   Rake::Task[:ci].invoke if ENV['CI']
   case build_host
   case build_host
   when /linux/
   when /linux/
-    $max_jobs = `grep -c processor /proc/cpuinfo`.chomp
+    $max_jobs = `grep -c processor /proc/cpuinfo`.chomp unless $max_jobs
     ENV['GENERATOR'] = 'generic' unless ENV['GENERATOR']
     ENV['GENERATOR'] = 'generic' unless ENV['GENERATOR']
     ENV['PLATFORM'] = 'linux' unless ENV['PLATFORM']
     ENV['PLATFORM'] = 'linux' unless ENV['PLATFORM']
   when /darwin|macOS/
   when /darwin|macOS/
-    $max_jobs = `sysctl -n hw.logicalcpu`.chomp
+    $max_jobs = `sysctl -n hw.logicalcpu`.chomp unless $max_jobs
     ENV['GENERATOR'] = 'xcode' unless ENV['GENERATOR']
     ENV['GENERATOR'] = 'xcode' unless ENV['GENERATOR']
     ENV['PLATFORM'] = 'macOS' unless ENV['PLATFORM']
     ENV['PLATFORM'] = 'macOS' unless ENV['PLATFORM']
   when /win32|mingw|mswin|windows/
   when /win32|mingw|mswin|windows/
-    require 'win32ole'
-    WIN32OLE.connect('winmgmts://').ExecQuery("select NumberOfLogicalProcessors from Win32_ComputerSystem").each { |it|
-      $max_jobs = it.NumberOfLogicalProcessors
-    }
+    unless $max_jobs
+      require 'win32ole'
+      WIN32OLE.connect('winmgmts://').ExecQuery("select NumberOfLogicalProcessors from Win32_ComputerSystem").each { |it|
+        $max_jobs = it.NumberOfLogicalProcessors
+      }
+    end
     ENV['GENERATOR'] = 'vs' unless ENV['GENERATOR']
     ENV['GENERATOR'] = 'vs' unless ENV['GENERATOR']
     ENV['PLATFORM'] = 'win' unless ENV['PLATFORM']
     ENV['PLATFORM'] = 'win' unless ENV['PLATFORM']
   else
   else