From 6845f06dfb61269a624e7e1ed9e831d20ee40db3 Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Sun, 12 Jul 2026 05:33:55 +0000 Subject: [PATCH] ci(actions): Update workflow templates from organization template repository Signed-off-by: GitHub --- .github/actions-lock.txt | 8 ++++---- .github/workflows/appstore-build-publish.yml | 8 +++++--- .github/workflows/lint-php-cs.yml | 6 ++++-- .github/workflows/psalm-matrix.yml | 12 ++++++++---- .github/workflows/update-nextcloud-ocp-matrix.yml | 4 ++-- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/actions-lock.txt b/.github/actions-lock.txt index 95f5b39..f87d682 100644 --- a/.github/actions-lock.txt +++ b/.github/actions-lock.txt @@ -1,12 +1,12 @@ # SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors # SPDX-License-Identifier: MIT -d4697182231bf364a34d8dd8b9e52a00 appstore-build-publish.yml +3c9e67bdc06a172cae6461ab6801f95e appstore-build-publish.yml e6351c608939c31ae1e32923aa82aa10 dependabot-approve-merge.yml 023b664746d1f2e09a9aaaac772ff7f5 lint-info-xml.yml -870b483dbcbca59479211270d61546dd lint-php-cs.yml +660a12f14e32c1b2d24c418232d918da lint-php-cs.yml ee2b04d185b82fe7dd6fe6d83c6c7b45 lint-php.yml -482b8c0da56ce273cf3ee464a5ed3290 psalm-matrix.yml +19d3ab0a48769d30c1cf16b53139b2f8 psalm-matrix.yml 3975dc58817119d596a8f6ed190352ce reuse.yml 9799b1a6a842b5c0076b76de651a0e0d sync-workflow-templates.yml a3440826636c0fd7c2d20b1de50363da update-nextcloud-ocp-approve-merge.yml -514949df34f4d62163224a486138db4e update-nextcloud-ocp-matrix.yml +dab8176b591e67703952dc9441a913c0 update-nextcloud-ocp-matrix.yml diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index 984567e..c4cf97f 100644 --- a/.github/workflows/appstore-build-publish.yml +++ b/.github/workflows/appstore-build-publish.yml @@ -103,9 +103,11 @@ jobs: - name: Install composer dependencies if: steps.check_composer.outputs.files_exists == 'true' - run: | - cd ${{ env.APP_NAME }} - composer install --no-dev + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 + with: + composer-options: '--no-dev' + working-directory: ${{ env.APP_NAME }} + ignore-cache: 'yes' - name: Build ${{ env.APP_NAME }} # Skip if no package.json diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index bb67a00..0a65977 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -43,10 +43,12 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Install dependencies + - name: Remove nextcloud/ocp run: | composer remove nextcloud/ocp --dev --no-scripts - composer i + + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 - name: Lint run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml index 2f72873..b2d0ff1 100644 --- a/.github/workflows/psalm-matrix.yml +++ b/.github/workflows/psalm-matrix.yml @@ -63,13 +63,17 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Install dependencies + - name: Remove nextcloud/ocp run: | composer remove nextcloud/ocp --dev --no-scripts - composer i - - name: Install dependencies # zizmor: ignore[template-injection] - run: composer require --dev 'nextcloud/ocp:${{ matrix.ocp-version }}' --ignore-platform-reqs --with-dependencies + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 + + - name: Install nextcloud/ocp:${{ matrix.ocp-version }} + env: + OCP_VERSION: ${{ matrix.ocp-version }} + run: composer require --dev "nextcloud/ocp:$OCP_VERSION" --ignore-platform-reqs --with-dependencies - name: Run coding standards check run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github diff --git a/.github/workflows/update-nextcloud-ocp-matrix.yml b/.github/workflows/update-nextcloud-ocp-matrix.yml index ecaf3d8..fff6a40 100644 --- a/.github/workflows/update-nextcloud-ocp-matrix.yml +++ b/.github/workflows/update-nextcloud-ocp-matrix.yml @@ -59,8 +59,8 @@ jobs: grep '/appinfo/info.xml' .github/CODEOWNERS | cut -f 2- -d ' ' | xargs | awk '{ print "codeowners="$0 }' >> $GITHUB_OUTPUT continue-on-error: true - - name: Composer install - run: composer install + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 - name: Check composer bin for nextcloud/ocp exists id: check_composer_bin