Merge pull request #2577 from yalpul/patch-1

CI: Make processor count consistent

Merge pull request #2577 from yalpul/patch-1
CI: Make processor count consistent
3b27eee2 · Colin Edwards · GitHub · e10d44d5 · 6b347910 · 3b27eee2
隐藏空白更改
内联并排

Showing with 2 addition and 4 deletion

formatcode.sh formatcode.sh +2 -4

未找到文件。
--- a/formatcode.sh
+++ b/formatcode.sh
@@ -14,10 +14,8 @@ set -o nounset
 # Get CPU count
 OS=$(uname)
 NPROC=1
-if [[ $OS = "Linux" ]] ; then
-    NPROC=$(nproc)
-elif [[ ${OS} = "Darwin" ]] ; then
-    NPROC=$(sysctl -n hw.physicalcpu)
+if [[ $OS = "Linux" || $OS = "Darwin" ]] ; then
+    NPROC=$(getconf _NPROCESSORS_ONLN)
 fi

 # Discover clang-format