Skip to content
Snippets Groups Projects
Verified Commit a5c4ebf2 authored by Dave Long's avatar Dave Long
Browse files

Issue #3407360 by alexpott, xjm, longwave, quietone, smustgrave, mstrelan:...

Issue #3407360 by alexpott, xjm, longwave, quietone, smustgrave, mstrelan: Commit check script: nproc does not exist on Darwin
parent 85ff4063
No related branches found
No related tags found
No related merge requests found
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
"Drupal\\Composer\\Composer::generateMetapackages", "Drupal\\Composer\\Composer::generateMetapackages",
"Drupal\\Composer\\Composer::generateComponentPackages" "Drupal\\Composer\\Composer::generateComponentPackages"
], ],
"phpcs": "phpcs --standard=core/phpcs.xml.dist --parallel=$(nproc) --", "phpcs": "phpcs --standard=core/phpcs.xml.dist --parallel=\"$( (nproc || sysctl -n hw.logicalcpu || echo 4) 2>/dev/null)\" --",
"phpcbf": "phpcbf --standard=core/phpcs.xml.dist --parallel=$(nproc) --" "phpcbf": "phpcbf --standard=core/phpcs.xml.dist --parallel=\"$( (nproc || sysctl -n hw.logicalcpu || echo 4) 2>/dev/null)\" --"
}, },
"repositories": [ "repositories": [
{ {
......
...@@ -426,6 +426,7 @@ lnumber ...@@ -426,6 +426,7 @@ lnumber
loadjs loadjs
localemark localemark
localetranslatedirty localetranslatedirty
logicalcpu
lolspeak lolspeak
longblob longblob
longerthan longerthan
......
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
# Run PHPCS on all files on DrupalCI or when phpcs files are changed. # Run PHPCS on all files on DrupalCI or when phpcs files are changed.
if [[ $PHPCS_XML_DIST_FILE_CHANGED == "1" ]] || [[ "$DRUPALCI" == "1" ]]; then if [[ $PHPCS_XML_DIST_FILE_CHANGED == "1" ]] || [[ "$DRUPALCI" == "1" ]]; then
# Test all files with phpcs rules. # Test all files with phpcs rules.
vendor/bin/phpcs -ps --parallel=$(nproc) --standard="$TOP_LEVEL/core/phpcs.xml.dist" vendor/bin/phpcs -ps --parallel="$( (nproc || sysctl -n hw.logicalcpu || echo 4) 2>/dev/null)" --standard="$TOP_LEVEL/core/phpcs.xml.dist"
PHPCS=$? PHPCS=$?
if [ "$PHPCS" -ne "0" ]; then if [ "$PHPCS" -ne "0" ]; then
# If there are failures set the status to a number other than 0. # If there are failures set the status to a number other than 0.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment