From 71162629cfd1cc9efd4a8bdd74faf310045c9358 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 1 Jun 2023 23:47:21 +0200 Subject: [PATCH] fix(CI): Temporary workaround - Run Psalm CI with 1 thread only so it finishes Signed-off-by: Joas Schilling --- .github/workflows/static-code-analysis.yml | 6 +++--- composer.json | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml index 4ae8babf843..941e5ddfe3f 100644 --- a/.github/workflows/static-code-analysis.yml +++ b/.github/workflows/static-code-analysis.yml @@ -32,7 +32,7 @@ jobs: run: composer i - name: Psalm - run: composer run psalm -- --monochrome --no-progress --output-format=github --update-baseline --report=results.sarif + run: composer run psalm:ci -- --monochrome --no-progress --output-format=github --update-baseline --report=results.sarif - name: Show potential changes in Psalm baseline if: always() @@ -64,7 +64,7 @@ jobs: run: composer i - name: Psalm taint analysis - run: composer run psalm -- --monochrome --no-progress --output-format=github --report=results.sarif --taint-analysis + run: composer run psalm:ci -- --monochrome --no-progress --output-format=github --report=results.sarif --taint-analysis - name: Upload Security Analysis results to GitHub if: always() @@ -94,7 +94,7 @@ jobs: run: composer i - name: Psalm - run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline + run: composer run psalm:ci -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline - name: Show potential changes in Psalm baseline if: always() diff --git a/composer.json b/composer.json index 4a58833c996..603bf86b7c0 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,8 @@ "cs:fix": "php-cs-fixer fix", "cs:check": "php-cs-fixer fix --dry-run --diff", "lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/stubs/*' -print0 | xargs -0 -n1 php -l", - "psalm": "psalm --threads=1", - "psalm:update-baseline": "psalm --threads=1 --update-baseline" + "psalm": "psalm --threads=$(nproc)", + "psalm:ci": "psalm --threads=1", + "psalm:update-baseline": "psalm --threads=$(nproc) --update-baseline" } }