diff --git a/.github/actions/setup-build/action.yaml b/.github/actions/setup-build/action.yaml index 11a266b9..2883f25a 100644 --- a/.github/actions/setup-build/action.yaml +++ b/.github/actions/setup-build/action.yaml @@ -62,6 +62,10 @@ runs: shell: bash run: composer require ${{ inputs.composer-require }} --dev --no-update --working-dir=${{ inputs.composer-working-dir }} + - name: "Remove Psalm from dependencies" + shell: bash + run: composer remove --dev vimeo/psalm + - name: "Validate composer.json" shell: bash run: composer validate --no-check-publish --no-check-lock --working-dir=${{ inputs.composer-working-dir }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 16540c7e..1ccafa74 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,7 +36,9 @@ jobs: - name: "Psalm" if: always() - run: vendor/bin/psalm + run: | + composer require -W --dev vimeo/psalm:^5.0 + vendor/bin/psalm unit-tests: name: "Unit Tests - PHP ${{ matrix.php-version }}, Sf ${{ matrix.symfony-version }}${{ matrix.dependency-versions && format(', Deps: {0}', matrix.dependency-versions) }}"