Skip to content

Commit 3c1a745

Browse files
authored
Merge pull request #23480 from nextcloud/backport/23401/stable20
[stable20] Use own psalm instead of a global one
2 parents 8985f46 + 7054159 commit 3c1a745

File tree

4 files changed

+1178
-161
lines changed

4 files changed

+1178
-161
lines changed

.github/workflows/static-code-analysis.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ jobs:
1313
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
1414
git submodule sync --recursive
1515
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
16-
- name: Remove composer.json
17-
shell: bash
18-
run: rm composer.json composer.lock
19-
- name: Psalm
20-
uses: docker://jakzal/phpqa:php7.4-alpine
16+
- name: Set up php7.4
17+
uses: shivammathur/setup-php@master
2118
with:
22-
args: psalm --monochrome --no-progress --output-format=text --update-baseline || ( git diff && exit 1 )
19+
php-version: 7.4
20+
coverage: none
21+
- name: Composer install
22+
run: composer i
23+
- name: Psalm
24+
run: composer run psalm -- --monochrome --no-progress --output-format=text --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
25+
- name: Check diff
26+
run: git diff -- . ':!lib/composer'
2327
- name: Show potential changes in Psalm baseline
2428
run: |
2529
bash -c "[[ ! \"`git status --porcelain build/psalm-baseline.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"

0 commit comments

Comments
 (0)