From 5ebd25d60069180742c00c2a25675235d3356f4f Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Sun, 12 Jul 2026 05:43:09 +0000 Subject: [PATCH] ci(actions): Update workflow templates from organization template repository Signed-off-by: GitHub --- .github/actions-lock.txt | 20 ++++++++++---------- .github/workflows/command-openapi.yml | 4 ++-- .github/workflows/lint-php-cs.yml | 6 ++++-- .github/workflows/openapi.yml | 4 ++-- .github/workflows/phpunit-mysql.yml | 8 ++++++-- .github/workflows/phpunit-oci.yml | 8 ++++++-- .github/workflows/phpunit-pgsql.yml | 8 ++++++-- .github/workflows/phpunit-sqlite.yml | 8 ++++++-- .github/workflows/pr-feedback.yml | 2 +- .github/workflows/psalm.yml | 8 +++++--- .github/workflows/update-nextcloud-ocp.yml | 4 ++-- 11 files changed, 50 insertions(+), 30 deletions(-) diff --git a/.github/actions-lock.txt b/.github/actions-lock.txt index af653770a..1432c3752 100644 --- a/.github/actions-lock.txt +++ b/.github/actions-lock.txt @@ -4,25 +4,25 @@ 25fc4c7e69e778e20bdc9eb0cc96367e block-merge-freeze.yml 5a7b85f72877c560683ba523ffad11cc block-unconventional-commits.yml 47319d4424574e468e7d0692fd0c61d3 command-compile.yml -c59d7af4f4f168b2687bf5efabf159da command-openapi.yml +2bd182b96079d6761051ee4a4a037a90 command-openapi.yml e6351c608939c31ae1e32923aa82aa10 dependabot-approve-merge.yml 2581a67c5bcdcd570427e6d51db767d7 fixup.yml 2a205b6cc57c26c31a18a7f41190f3e2 lint-eslint.yml 023b664746d1f2e09a9aaaac772ff7f5 lint-info-xml.yml -870b483dbcbca59479211270d61546dd lint-php-cs.yml +660a12f14e32c1b2d24c418232d918da lint-php-cs.yml ee2b04d185b82fe7dd6fe6d83c6c7b45 lint-php.yml 351799835db66dd8d20e324970490e96 lint-stylelint.yml 03759c9dc0fa748cb927b9f9cadf2925 node.yml 7e9fa275fffbfef58e6348a44750e2ec npm-audit-fix.yml -bf82c00cb71927a1bb0bb89c6b4dc5fd openapi.yml -d676be1ed03142832d8e712962f5961c phpunit-mysql.yml -ec26ef77882d1c19cba1ce168f927c2b phpunit-oci.yml -e92532f6ac32d39a1ff5c5d57b9686ba phpunit-pgsql.yml -9e8a660a88b8253f33593880710f1df3 phpunit-sqlite.yml -3c4a096b3b7dbaef0f8e5190ffe13518 pr-feedback.yml -20b5d0d45766e3793f19c9c0c8d05140 psalm.yml +be4595b4233fc29c9b6fb4a6e71cae6e openapi.yml +301cb65c1ccc97c22129ad3960ce7f5b phpunit-mysql.yml +fd5eecd6642b35edcff1ab4245a5db76 phpunit-oci.yml +59058fad92d407ffcf16efd401ef1cd5 phpunit-pgsql.yml +dad763027c0d87999474917d6818dbc9 phpunit-sqlite.yml +d1821b8a816578070ed8fd018f321f6d pr-feedback.yml +87bff1e6b8ae3ec6522b134a3d0f7a1c psalm.yml 3975dc58817119d596a8f6ed190352ce reuse.yml a3440826636c0fd7c2d20b1de50363da update-nextcloud-ocp-approve-merge.yml -39db87018db395caf41007931817cdbd update-nextcloud-ocp.yml +661b96e2d459555a19b99f5f68c334ce update-nextcloud-ocp.yml 22604c31b526de270a080eb19967a638 update-stable-titles.yml fcdb95d98ab64de64587191bbd71b2cb npm-build.yml diff --git a/.github/workflows/command-openapi.yml b/.github/workflows/command-openapi.yml index fce03d678..83bae892d 100644 --- a/.github/workflows/command-openapi.yml +++ b/.github/workflows/command-openapi.yml @@ -155,8 +155,8 @@ jobs: run: | npm ci - - name: Set up dependencies - run: composer i + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 - name: Regenerate OpenAPI run: composer run openapi diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index bb67a0042..0a65977be 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/openapi.yml b/.github/workflows/openapi.yml index f4dba5662..20c1a5cb9 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -78,8 +78,8 @@ jobs: run: | npm ci - - name: Set up dependencies - run: composer i + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 - name: Regenerate OpenAPI run: composer run openapi diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index d26a6f364..a8d4d7745 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -127,13 +127,17 @@ jobs: with: files: apps/${{ env.APP_NAME }}/composer.json - - name: Set up dependencies + - name: Remove nextcloud/ocp # Only run if phpunit config file exists if: steps.check_composer.outputs.files_exists == 'true' working-directory: apps/${{ env.APP_NAME }} run: | composer remove nextcloud/ocp --dev --no-scripts - composer i + + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 + with: + working-directory: apps/${{ env.APP_NAME }} - name: Set up Nextcloud env: diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index 31f257258..aebd2ae7e 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -134,13 +134,17 @@ jobs: with: files: apps/${{ env.APP_NAME }}/composer.json - - name: Set up dependencies + - name: Remove nextcloud/ocp # Only run if phpunit config file exists if: steps.check_composer.outputs.files_exists == 'true' working-directory: apps/${{ env.APP_NAME }} run: | composer remove nextcloud/ocp --dev --no-scripts - composer i + + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 + with: + working-directory: apps/${{ env.APP_NAME }} - name: Set up Nextcloud env: diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index ee72e2ccb..a3d990755 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -125,13 +125,17 @@ jobs: with: files: apps/${{ env.APP_NAME }}/composer.json - - name: Set up dependencies + - name: Remove nextcloud/ocp # Only run if phpunit config file exists if: steps.check_composer.outputs.files_exists == 'true' working-directory: apps/${{ env.APP_NAME }} run: | composer remove nextcloud/ocp --dev --no-scripts - composer i + + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 + with: + working-directory: apps/${{ env.APP_NAME }} - name: Set up Nextcloud env: diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 3ecdde371..968ccc887 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -114,13 +114,17 @@ jobs: with: files: apps/${{ env.APP_NAME }}/composer.json - - name: Set up dependencies + - name: Remove nextcloud/ocp # Only run if phpunit config file exists if: steps.check_composer.outputs.files_exists == 'true' working-directory: apps/${{ env.APP_NAME }} run: | composer remove nextcloud/ocp --dev --no-scripts - composer i + + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 + with: + working-directory: apps/${{ env.APP_NAME }} - name: Set up Nextcloud env: diff --git a/.github/workflows/pr-feedback.yml b/.github/workflows/pr-feedback.yml index f4c0477ce..4420bf692 100644 --- a/.github/workflows/pr-feedback.yml +++ b/.github/workflows/pr-feedback.yml @@ -36,7 +36,7 @@ jobs: blocklist=$(curl https://raw.githubusercontent.com/nextcloud/.github/master/non-community-usernames.txt | paste -s -d, -) echo "blocklist=$blocklist" >> "$GITHUB_OUTPUT" - - uses: nextcloud/pr-feedback-action@f0cab224dea8e1f282f9451de322f323c78fc7a5 # main + - uses: nextcloud/pr-feedback-action@5227c55be184087d0aef6338bee210d8620b6297 # v1.0.1 with: feedback-message: | Hello there, diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 82f306edd..4feadcb8f 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -47,12 +47,14 @@ 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 nextcloud/ocp + - name: Install composer dependencies + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 + + - name: Install nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies - name: Run coding standards check diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index f89667354..bec0944aa 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -62,9 +62,9 @@ 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 + - name: Install composer dependencies if: steps.checkout.outcome == 'success' - run: composer install + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 - name: Check composer bin for nextcloud/ocp exists id: check_composer_bin