From 42bb6cd7d780e6405c55c975621781b4ee0e585e Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 18 Aug 2020 12:37:53 +0200
Subject: [PATCH] Check only the baseline.xml and exclude the psalm.xml from
the file check
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
.github/workflows/static-code-analysis.yml | 2 +-
build/files-checker.php | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index bd7476df1ec..f90e102a99d 100644
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -22,4 +22,4 @@ jobs:
args: psalm --monochrome --no-progress --output-format=text --update-baseline
- name: Check for changes in Psalm baseline
run: |
- bash -c "[[ ! \"`git status --porcelain `\" ]] || ( 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 && exit 1 )"
diff --git a/build/files-checker.php b/build/files-checker.php
index b8c60727b0c..08cf21dde8d 100644
--- a/build/files-checker.php
+++ b/build/files-checker.php
@@ -70,6 +70,7 @@ $expectedFiles = [
'ocs',
'package-lock.json',
'package.json',
+ 'psalm.xml',
'public.php',
'README.md',
'remote.php',
--
GitLab