From fcba94e4d1e9a824e4412f65eb26ba5b1c7934c9 Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Wed, 12 Nov 2025 11:49:46 +0100 Subject: [PATCH] restore some details Signed-off-by: Simon L. --- .github/workflows/lint-php.yml | 30 ++++++++++--------------- .github/workflows/psalm.yml | 40 +++++++++++++++------------------- 2 files changed, 28 insertions(+), 42 deletions(-) diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index ae487584..9c5e8925 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -8,7 +8,15 @@ name: Lint php -on: pull_request +on: + pull_request: + paths: + - 'php/**' + push: + branches: + - main + paths: + - 'php/**' permissions: contents: read @@ -18,26 +26,11 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest-low - outputs: - php-versions: ${{ steps.versions.outputs.php-versions }} - steps: - - name: Checkout app - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - with: - persist-credentials: false - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.0.0 - php-lint: runs-on: ubuntu-latest - needs: matrix strategy: matrix: - php-versions: ${{fromJson(needs.matrix.outputs.php-versions)}} + php-versions: [ "8.4" ] name: php-lint @@ -51,14 +44,13 @@ jobs: uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5 with: php-version: ${{ matrix.php-versions }} - extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite coverage: none ini-file: development env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Lint - run: composer run lint + run: cd php && composer run lint summary: permissions: diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 3059026e..6ba0256a 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -8,7 +8,15 @@ name: Static analysis -on: pull_request +on: + pull_request: + paths: + - 'php/**' + push: + branches: + - main + paths: + - 'php/**' concurrency: group: psalm-${{ github.head_ref || github.run_id }} @@ -28,18 +36,11 @@ jobs: with: persist-credentials: false - - name: Get php version - id: versions - uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - - - name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml - run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml - - - name: Set up php${{ steps.versions.outputs.php-available }} + - name: Set up php uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5 with: - php-version: ${{ steps.versions.outputs.php-available }} - extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite + php-version: 8.4 + extensions: apcu coverage: none ini-file: development # Temporary workaround for missing pcntl_* in PHP 8.3 @@ -47,16 +48,9 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Install dependencies + - name: Install dependencies and run psalm run: | - composer remove nextcloud/ocp --dev --no-scripts - composer i - - - name: Check for vulnerable PHP dependencies - run: composer require --dev roave/security-advisories:dev-latest - - - name: Install nextcloud/ocp - run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies - - - name: Run coding standards check - run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github + set -x + cd php + composer install + composer run psalm