]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix(CI): Temporary workaround - Run Psalm CI with 1 thread only so it finishes
authorJoas Schilling <coding@schilljs.com>
Thu, 1 Jun 2023 21:47:21 +0000 (23:47 +0200)
committerJohn Molakvoæ <skjnldsv@users.noreply.github.com>
Thu, 8 Jun 2023 14:20:49 +0000 (16:20 +0200)
Signed-off-by: Joas Schilling <coding@schilljs.com>
.github/workflows/static-code-analysis.yml
composer.json

index 4ae8babf8435ef761a842f2cee31251bf7b4f4da..941e5ddfe3f0af2633b7a7fba945fa255a0554e7 100644 (file)
@@ -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()
index 4a58833c99614fa78c95f0cb4371c0c1e8694f93..603bf86b7c0ebf3239b52484195539ddacae288a 100644 (file)
@@ -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"
        }
 }