remove -q

GoogleCloudPlatform · Oct 2, 2024 · 8f32107 · 8f32107
1 parent a8c9ae0
commit 8f32107
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.github/workflows/code-standards.yml b/.github/workflows/code-standards.yml
@@ -64,11 +64,17 @@ jobs:
         uses: dcarbone/install-jq-action@v2
       - name: Run PHP CS Fixer
         run: |
+<<<<<<< Updated upstream
           composer global require friendsofphp/php-cs-fixer:${{ inputs.version }} -q
           export RULES=$(echo $'${{ inputs.rules }} ${{ inputs.add-rules }}'|tr -d '\n\t\r '|jq -s '.[0] * .[1]' -crM)
           export EXCLUDE_PATTERNS=$(echo $'${{ inputs.exclude-patterns }}'|tr -d '\n\t\r ')
           CMD_PATH=$([ "$EXCLUDE_PATTERNS" == "" ] && echo "$CONFIG_PATH")
           CONFIG_OR_RULES=$([ ! -z "$CONFIG" ] && echo "--config=$CONFIG" || echo --rules=$RULES)
+=======
+          composer global require friendsofphp/php-cs-fixer:${{ inputs.version }}
+          CONFIG="${{ inputs.config }}"
+          RULES=$(echo $'${{ inputs.rules }} ${{ inputs.add-rules }}'|tr -d '\n\t\r '|jq -s '.[0] * .[1]' -crM)
+>>>>>>> Stashed changes
 
           echo "TEST"
           set -x