From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 19 Aug 2020 16:12:15 +0000 (+0200)
Subject: Better psalm CI output
X-Git-Tag: v20.0.0beta1~39^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F22304%2Fhead;p=nextcloud-server.git

Better psalm CI output

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---

diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index f90e102a99d..184b58a7472 100644
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -19,7 +19,7 @@ jobs:
             - name: Psalm
               uses: docker://jakzal/phpqa:php7.4-alpine
               with:
-                args: psalm --monochrome --no-progress --output-format=text --update-baseline
+                args: psalm --monochrome --no-progress --output-format=text --update-baseline || ( git diff && exit 1 )
             - name: Check for changes in Psalm baseline
               run: |
-                bash -c "[[ ! \"`git status --porcelain build/psalm-baseline.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff && exit 1 )"
+                bash -c "[[ ! \"`git status --porcelain build/psalm-baseline.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml && exit 1 )"