diff --git a/.github/actions-lock.txt b/.github/actions-lock.txt new file mode 100644 index 000000000..47eb4c8f4 --- /dev/null +++ b/.github/actions-lock.txt @@ -0,0 +1,22 @@ +# SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT +3c9e67bdc06a172cae6461ab6801f95e appstore-build-publish.yml +e6351c608939c31ae1e32923aa82aa10 dependabot-approve-merge.yml +2581a67c5bcdcd570427e6d51db767d7 fixup.yml +2a205b6cc57c26c31a18a7f41190f3e2 lint-eslint.yml +023b664746d1f2e09a9aaaac772ff7f5 lint-info-xml.yml +660a12f14e32c1b2d24c418232d918da lint-php-cs.yml +ee2b04d185b82fe7dd6fe6d83c6c7b45 lint-php.yml +351799835db66dd8d20e324970490e96 lint-stylelint.yml +e8c1aea88c781b9d47186a2f38b209d6 node-test.yml +be4595b4233fc29c9b6fb4a6e71cae6e openapi.yml +c430223b9be698107fc1c10ddd3b4580 phpunit-mariadb.yml +301cb65c1ccc97c22129ad3960ce7f5b phpunit-mysql.yml +fd5eecd6642b35edcff1ab4245a5db76 phpunit-oci.yml +59058fad92d407ffcf16efd401ef1cd5 phpunit-pgsql.yml +dad763027c0d87999474917d6818dbc9 phpunit-sqlite.yml +d1821b8a816578070ed8fd018f321f6d pr-feedback.yml +19d3ab0a48769d30c1cf16b53139b2f8 psalm-matrix.yml +61ceb8f4bddaa49bfdd452111eee7cf9 rector-apply.yml +3975dc58817119d596a8f6ed190352ce reuse.yml +9799b1a6a842b5c0076b76de651a0e0d sync-workflow-templates.yml diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index 984567e8f..c4cf97f7b 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-eslint.yml b/.github/workflows/lint-eslint.yml index 9d8e3e178..3e34f7e8c 100644 --- a/.github/workflows/lint-eslint.yml +++ b/.github/workflows/lint-eslint.yml @@ -28,7 +28,7 @@ jobs: src: ${{ steps.changes.outputs.src}} steps: - - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2 + - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: changes continue-on-error: true with: diff --git a/.github/workflows/lint-info-xml.yml b/.github/workflows/lint-info-xml.yml index 059b2e600..e55705222 100644 --- a/.github/workflows/lint-info-xml.yml +++ b/.github/workflows/lint-info-xml.yml @@ -27,6 +27,8 @@ jobs: uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false + sparse-checkout: | + appinfo/ - name: Download schema run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd 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/node-test.yml b/.github/workflows/node-test.yml index fe8f36774..97c5cb991 100644 --- a/.github/workflows/node-test.yml +++ b/.github/workflows/node-test.yml @@ -34,7 +34,7 @@ jobs: src: ${{ steps.changes.outputs.src}} steps: - - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2 + - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: changes continue-on-error: true with: 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-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index b29495c3e..5d69d19c9 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -43,7 +43,7 @@ jobs: src: ${{ steps.changes.outputs.src}} steps: - - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2 + - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: changes continue-on-error: true with: @@ -67,6 +67,7 @@ jobs: if: needs.changes.outputs.src != 'false' strategy: + fail-fast: false matrix: php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} @@ -136,13 +137,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-mariadb.yml.patch b/.github/workflows/phpunit-mariadb.yml.patch new file mode 100644 index 000000000..c0a71eced --- /dev/null +++ b/.github/workflows/phpunit-mariadb.yml.patch @@ -0,0 +1,37 @@ +diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml +index 2e7b92b0..5d69d19c 100644 +--- a/.github/workflows/phpunit-mariadb.yml ++++ b/.github/workflows/phpunit-mariadb.yml +@@ -105,6 +105,14 @@ jobs: + persist-credentials: false + path: apps/${{ env.APP_NAME }} + ++ - name: Checkout teams dependency ++ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 ++ with: ++ persist-credentials: false ++ repository: nextcloud/circles ++ ref: ${{ matrix.server-versions }} ++ path: apps/circles ++ + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 + with: +@@ -160,7 +168,7 @@ jobs: + # Only run if phpunit config file exists + if: steps.check_phpunit.outcome == 'success' + working-directory: apps/${{ env.APP_NAME }} +- run: composer run test:unit ++ run: composer run test:unit -- --no-coverage + + - name: Check PHPUnit integration script is defined + id: check_integration +@@ -178,7 +186,7 @@ jobs: + # Only run if phpunit integration config file exists + if: steps.check_integration.outcome == 'success' + working-directory: apps/${{ env.APP_NAME }} +- run: composer run test:integration ++ run: composer run test:integration -- --no-coverage + + - name: Print logs + if: always() diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 0735a51b3..d6e8bc33c 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -44,7 +44,7 @@ jobs: src: ${{ steps.changes.outputs.src}} steps: - - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2 + - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: changes continue-on-error: true with: @@ -68,6 +68,7 @@ jobs: if: needs.changes.outputs.src != 'false' strategy: + fail-fast: false matrix: ${{ fromJson(needs.matrix.outputs.matrix) }} name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} @@ -134,13 +135,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-mysql.yml.patch b/.github/workflows/phpunit-mysql.yml.patch new file mode 100644 index 000000000..5cd51dc79 --- /dev/null +++ b/.github/workflows/phpunit-mysql.yml.patch @@ -0,0 +1,37 @@ +diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml +index 596d91ea..d6e8bc33 100644 +--- a/.github/workflows/phpunit-mysql.yml ++++ b/.github/workflows/phpunit-mysql.yml +@@ -103,6 +103,14 @@ jobs: + persist-credentials: false + path: apps/${{ env.APP_NAME }} + ++ - name: Checkout teams dependency ++ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 ++ with: ++ persist-credentials: false ++ repository: nextcloud/circles ++ ref: ${{ matrix.server-versions }} ++ path: apps/circles ++ + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 + with: +@@ -158,7 +166,7 @@ jobs: + # Only run if phpunit config file exists + if: steps.check_phpunit.outcome == 'success' + working-directory: apps/${{ env.APP_NAME }} +- run: composer run test:unit ++ run: composer run test:unit -- --no-coverage + + - name: Check PHPUnit integration script is defined + id: check_integration +@@ -176,7 +184,7 @@ jobs: + # Only run if phpunit integration config file exists + if: steps.check_integration.outcome == 'success' + working-directory: apps/${{ env.APP_NAME }} +- run: composer run test:integration ++ run: composer run test:integration -- --no-coverage + + - name: Print logs + if: always() diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index 6e7bee0da..52616262c 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -43,7 +43,7 @@ jobs: src: ${{ steps.changes.outputs.src }} steps: - - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2 + - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: changes continue-on-error: true with: @@ -67,6 +67,7 @@ jobs: if: needs.changes.outputs.src != 'false' strategy: + fail-fast: false matrix: php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} @@ -141,13 +142,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.patch b/.github/workflows/phpunit-oci.yml.patch new file mode 100644 index 000000000..bd8932d60 --- /dev/null +++ b/.github/workflows/phpunit-oci.yml.patch @@ -0,0 +1,37 @@ +diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml +index 4314399b..52616262 100644 +--- a/.github/workflows/phpunit-oci.yml ++++ b/.github/workflows/phpunit-oci.yml +@@ -115,6 +115,14 @@ jobs: + persist-credentials: false + path: apps/${{ env.APP_NAME }} + ++ - name: Checkout teams dependency ++ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 ++ with: ++ persist-credentials: false ++ repository: nextcloud/circles ++ ref: ${{ matrix.server-versions }} ++ path: apps/circles ++ + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 + with: +@@ -165,7 +173,7 @@ jobs: + # Only run if phpunit config file exists + if: steps.check_phpunit.outcome == 'success' + working-directory: apps/${{ env.APP_NAME }} +- run: composer run test:unit ++ run: composer run test:unit -- --no-coverage + + - name: Check PHPUnit integration script is defined + id: check_integration +@@ -183,7 +191,7 @@ jobs: + # Only run if phpunit integration config file exists + if: steps.check_integration.outcome == 'success' + working-directory: apps/${{ env.APP_NAME }} +- run: composer run test:integration ++ run: composer run test:integration -- --no-coverage + + - name: Print logs + if: always() diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 68624413e..01da9d6b4 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -43,7 +43,7 @@ jobs: src: ${{ steps.changes.outputs.src }} steps: - - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2 + - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: changes continue-on-error: true with: @@ -67,6 +67,7 @@ jobs: if: needs.changes.outputs.src != 'false' strategy: + fail-fast: false matrix: php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} @@ -132,13 +133,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.patch b/.github/workflows/phpunit-pgsql.yml.patch new file mode 100644 index 000000000..af7299001 --- /dev/null +++ b/.github/workflows/phpunit-pgsql.yml.patch @@ -0,0 +1,37 @@ +diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml +index dab23f2e..01da9d6b 100644 +--- a/.github/workflows/phpunit-pgsql.yml ++++ b/.github/workflows/phpunit-pgsql.yml +@@ -106,6 +106,14 @@ jobs: + persist-credentials: false + path: apps/${{ env.APP_NAME }} + ++ - name: Checkout teams dependency ++ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 ++ with: ++ persist-credentials: false ++ repository: nextcloud/circles ++ ref: ${{ matrix.server-versions }} ++ path: apps/circles ++ + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 + with: +@@ -156,7 +164,7 @@ jobs: + # Only run if phpunit config file exists + if: steps.check_phpunit.outcome == 'success' + working-directory: apps/${{ env.APP_NAME }} +- run: composer run test:unit ++ run: composer run test:unit -- --no-coverage + + - name: Check PHPUnit integration script is defined + id: check_integration +@@ -174,7 +182,7 @@ jobs: + # Only run if phpunit integration config file exists + if: steps.check_integration.outcome == 'success' + working-directory: apps/${{ env.APP_NAME }} +- run: composer run test:integration ++ run: composer run test:integration -- --no-coverage + + - name: Print logs + if: always() diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 6353c89a2..9d11374f4 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -43,7 +43,7 @@ jobs: src: ${{ steps.changes.outputs.src}} steps: - - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2 + - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1 id: changes continue-on-error: true with: @@ -67,6 +67,7 @@ jobs: if: needs.changes.outputs.src != 'false' strategy: + fail-fast: false matrix: php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} @@ -129,13 +130,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.patch b/.github/workflows/phpunit-sqlite.yml.patch new file mode 100644 index 000000000..73010cc5d --- /dev/null +++ b/.github/workflows/phpunit-sqlite.yml.patch @@ -0,0 +1,67 @@ +diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml +index 273400a4..9d11374f 100644 +--- a/.github/workflows/phpunit-sqlite.yml ++++ b/.github/workflows/phpunit-sqlite.yml +@@ -95,13 +95,29 @@ jobs: + persist-credentials: false + path: apps/${{ env.APP_NAME }} + ++ - name: Checkout teams app ++ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 ++ with: ++ persist-credentials: false ++ repository: nextcloud/circles ++ ref: ${{ matrix.server-versions }} ++ path: apps/circles ++ ++ - name: Checkout analytics app ++ uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 ++ with: ++ persist-credentials: false ++ repository: rello/analytics ++ ref: master ++ path: apps/analytics ++ + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 + with: + php-version: ${{ matrix.php-versions }} + # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation + 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 ++ coverage: xdebug + ini-file: development + # Temporary workaround for missing pcntl_* in PHP 8.3 + ini-values: disable_functions= +@@ -147,6 +163,15 @@ jobs: + working-directory: apps/${{ env.APP_NAME }} + run: composer run test:unit + ++ - name: Upload Unit coverage ++ uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 ++ with: ++ working-directory: apps/${{ env.APP_NAME }} ++ disable_search: true ++ files: tests/clover.unit.xml ++ fail_ci_if_error: true ++ flags: unit ++ + - name: Check PHPUnit integration script is defined + id: check_integration + continue-on-error: true +@@ -165,6 +190,15 @@ jobs: + working-directory: apps/${{ env.APP_NAME }} + run: composer run test:integration + ++ - name: Upload Integration coverage ++ uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 ++ with: ++ working-directory: apps/${{ env.APP_NAME }} ++ disable_search: true ++ files: tests/clover.integration.xml ++ fail_ci_if_error: true ++ flags: integration ++ + - name: Print logs + if: always() + run: | diff --git a/.github/workflows/pr-feedback.yml b/.github/workflows/pr-feedback.yml index 5afd382f0..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@4709fa5b3e1821559d4c312ef937b61f1567aa44 # main + - uses: nextcloud/pr-feedback-action@5227c55be184087d0aef6338bee210d8620b6297 # v1.0.1 with: feedback-message: | Hello there, diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml index 2f72873b3..b2d0ff1ef 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/rector-apply.yml b/.github/workflows/rector-apply.yml index 48a746a4c..c61c5b106 100644 --- a/.github/workflows/rector-apply.yml +++ b/.github/workflows/rector-apply.yml @@ -45,10 +45,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: Rector run: composer run rector diff --git a/REUSE.toml b/REUSE.toml index 6518d3e04..c3b20471a 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -5,6 +5,12 @@ SPDX-PackageName = "forms" SPDX-PackageSupplier = "Nextcloud " SPDX-PackageDownloadLocation = "https://github.com/nextcloud/forms" +[[annotations]] +path = [".github/workflows/*.patch"] +precedence = "aggregate" +SPDX-FileCopyrightText = "none" +SPDX-License-Identifier = "CC0-1.0" + [[annotations]] path = ["l10n/**.js", "l10n/**.json", "js/**.js.map", "js/**.js"] precedence = "aggregate"