From 3eb534f76ea20a6643a888bfec3a7b34f1015f34 Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Sun, 12 Jul 2026 05:42:50 +0000 Subject: [PATCH] ci(actions): Update workflow templates from organization template repository Signed-off-by: GitHub --- .github/actions-lock.txt | 18 +++++++++--------- .github/workflows/appstore-build-publish.yml | 8 +++++--- .github/workflows/lint-php-cs.yml | 6 ++++-- .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 ++-- 10 files changed, 50 insertions(+), 28 deletions(-) diff --git a/.github/actions-lock.txt b/.github/actions-lock.txt index 64ab9c95..773718f2 100644 --- a/.github/actions-lock.txt +++ b/.github/actions-lock.txt @@ -1,23 +1,23 @@ # SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors # SPDX-License-Identifier: MIT -d4697182231bf364a34d8dd8b9e52a00 appstore-build-publish.yml +3c9e67bdc06a172cae6461ab6801f95e appstore-build-publish.yml 47319d4424574e468e7d0692fd0c61d3 command-compile.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 -d676be1ed03142832d8e712962f5961c phpunit-mysql.yml -ec26ef77882d1c19cba1ce168f927c2b phpunit-oci.yml -e92532f6ac32d39a1ff5c5d57b9686ba phpunit-pgsql.yml -9e8a660a88b8253f33593880710f1df3 phpunit-sqlite.yml -3c4a096b3b7dbaef0f8e5190ffe13518 pr-feedback.yml -20b5d0d45766e3793f19c9c0c8d05140 psalm.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 9799b1a6a842b5c0076b76de651a0e0d sync-workflow-templates.yml a3440826636c0fd7c2d20b1de50363da update-nextcloud-ocp-approve-merge.yml -39db87018db395caf41007931817cdbd update-nextcloud-ocp.yml +661b96e2d459555a19b99f5f68c334ce update-nextcloud-ocp.yml fcdb95d98ab64de64587191bbd71b2cb npm-build.yml diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index 984567e8..c4cf97f7 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 bb67a004..0a65977b 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/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 69db3b5d..596d91ea 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 20c84b19..4314399b 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 f93a8b12..dab23f2e 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 06abce11..273400a4 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 f4c0477c..4420bf69 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 eebe49f2..b0a42b2e 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 6a28a33f..8162864c 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