Verified Commit 65d3ab96 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

(cherry picked from commit dc2a4e9570a7638af6c747949311db777eff1ebe)
parent 290d8a42

composer.json

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ 
            "Drupal\\Composer\\Composer::generateMetapackages",

            "Drupal\\Composer\\Composer::generateComponentPackages"

        ],

        "phpcs": "phpcs --standard=core/phpcs.xml.dist --parallel=$(nproc) --",

        "phpcbf": "phpcbf --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 || sysctl -n hw.logicalcpu || echo 4) 2>/dev/null)\" --"

    },

    "repositories": [

        {

core/misc/cspell/dictionary.txt

+1 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ lnumber 
loadjs

localemark

localetranslatedirty

logicalcpu

lolspeak

longblob

longerthan

core/scripts/dev/commit-code-check.sh

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ 
# Run PHPCS on all files on DrupalCI or when phpcs files are changed.

if [[ $PHPCS_XML_DIST_FILE_CHANGED == "1" ]] || [[ "$DRUPALCI" == "1" ]]; then

  # 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=$?

  if [ "$PHPCS" -ne "0" ]; then

    # If there are failures set the status to a number other than 0.