Skip to content

Commit b84b259

Browse files
authored
Merge pull request #442 from ergebnis/fix/cache
Fix: Do not cache cache directory for `vimeo/psalm`
2 parents ff8c02f + 273882c commit b84b259

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

.github/workflows/integrate.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,8 @@ jobs:
161161
- name: "Create cache directory for vimeo/psalm"
162162
run: "mkdir -p .build/psalm"
163163

164-
- name: "Cache cache directory for vimeo/psalm"
165-
uses: "actions/cache@v2.1.7"
166-
with:
167-
path: ".build/psalm"
168-
key: "php-${{ matrix.php-version }}-psalm-${{ github.sha }}"
169-
restore-keys: "php-${{ matrix.php-version }}-psalm-"
170-
171164
- name: "Run vimeo/psalm"
172-
run: "vendor/bin/psalm --config=psalm.xml --diff --shepherd --show-info=false --stats --threads=4"
165+
run: "vendor/bin/psalm --config=psalm.xml --shepherd --show-info=false --stats --threads=4"
173166

174167
tests:
175168
name: "Tests"

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ static-code-analysis: vendor ## Runs a static code analysis with phpstan/phpstan
2121
mkdir -p .build/phpstan
2222
vendor/bin/phpstan analyse --configuration=phpstan.neon --memory-limit=-1
2323
mkdir -p .build/psalm
24-
vendor/bin/psalm --config=psalm.xml --diff --show-info=false --stats --threads=4
24+
vendor/bin/psalm --config=psalm.xml --clear-cache
25+
vendor/bin/psalm --config=psalm.xml --show-info=false --stats --threads=4
2526

2627
.PHONY: static-code-analysis-baseline
2728
static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with phpstan/phpstan and vimeo/psalm
2829
mkdir -p .build/phpstan
2930
echo '' > phpstan-baseline.neon
3031
vendor/bin/phpstan analyze --configuration=phpstan.neon --error-format=baselineNeon --memory-limit=-1 > phpstan-baseline.neon || true
3132
mkdir -p .build/psalm
33+
vendor/bin/psalm --config=psalm.xml --clear-cache
3234
vendor/bin/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml
3335

3436
.PHONY: tests

0 commit comments

Comments
 (0)