diff options
| author | Kate <26026535+provokateurin@users.noreply.github.com> | 2024-09-24 07:50:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-24 07:50:14 +0200 |
| commit | eb0202c003fedbe23c75669fb742279db5a960c4 (patch) | |
| tree | f986604f53a18ac081624b313b2922fbecd3323a | |
| parent | 38ea9131e490b47b1549364631d1e13c1e6cab53 (diff) | |
| parent | 2f1c2af6558493348d0341d3258512fee02d2c10 (diff) | |
| download | nextcloud-server-eb0202c003fedbe23c75669fb742279db5a960c4.tar.gz nextcloud-server-eb0202c003fedbe23c75669fb742279db5a960c4.zip | |
Merge pull request #48281 from nextcloud/backport/48266/stable28
| -rw-r--r-- | .github/workflows/static-code-analysis.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/update-psalm-baseline.yml | 67 | ||||
| -rw-r--r-- | psalm.xml | 2 |
3 files changed, 2 insertions, 69 deletions
diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml index 12e3ba8f062..a964eed6875 100644 --- a/.github/workflows/static-code-analysis.yml +++ b/.github/workflows/static-code-analysis.yml @@ -64,7 +64,7 @@ jobs: run: composer i - name: Psalm taint analysis - run: composer run psalm:ci -- --monochrome --no-progress --output-format=github --report=results.sarif --taint-analysis + run: composer run psalm:ci -- --monochrome --no-progress --output-format=github --report=results.sarif --taint-analysis --ignore-baseline - name: Upload Security Analysis results to GitHub if: always() diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml deleted file mode 100644 index 2ed5daf8bb0..00000000000 --- a/.github/workflows/update-psalm-baseline.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Update Psalm baseline - -on: - workflow_dispatch: - schedule: - - cron: "5 2 * * *" - -jobs: - update-psalm-baseline: - runs-on: ubuntu-latest - - if: ${{ github.repository_owner != 'nextcloud-gmbh' }} - - strategy: - fail-fast: false - matrix: - branches: ["master", "stable27", "stable26", "stable25"] - - name: update-psalm-baseline-${{ matrix.branches }} - - steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - with: - ref: ${{ matrix.branches }} - submodules: true - - - name: Set up php - uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 - with: - php-version: '8.0' - extensions: apcu,ctype,curl,dom,fileinfo,ftp,gd,intl,json,ldap,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip - coverage: none - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Composer install - run: composer install - - - name: Psalm - run: composer run psalm:ci -- --monochrome --no-progress --output-format=text --update-baseline - continue-on-error: true - - - name: Psalm OCP - run: composer run psalm:ci -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline - continue-on-error: true - - - name: Reset composer - run: | - git clean -f lib/composer - git checkout composer.json composer.lock lib/composer - - - name: Create Pull Request - uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 - with: - token: ${{ secrets.COMMAND_BOT_PAT }} - commit-message: Update psalm baseline - committer: GitHub <noreply@github.com> - author: nextcloud-command <nextcloud-command@users.noreply.github.com> - signoff: true - branch: automated/noid/${{ matrix.branches }}-update-psalm-baseline - title: "[${{ matrix.branches }}] Update psalm-baseline.xml" - body: | - Auto-generated update psalm-baseline.xml with fixed psalm warnings - labels: | - automated pr - 3. to review - team-reviewers: server-backend diff --git a/psalm.xml b/psalm.xml index bc1e62998ab..9afd7c20cae 100644 --- a/psalm.xml +++ b/psalm.xml @@ -7,7 +7,7 @@ xmlns="https://getpsalm.org/schema/config" xsi:schemaLocation="https://getpsalm.org/schema/config vendor-bin/psalm/vendor/vimeo/psalm/config.xsd" errorBaseline="build/psalm-baseline.xml" - findUnusedBaselineEntry="false" + findUnusedBaselineEntry="true" findUnusedCode="false" > <plugins> |