diff --git a/.github/actions-lock.txt b/.github/actions-lock.txt index 6f4d2b668..943d59518 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 -2afe22a01c1c2413f0cf48d010a13396 appstore-build-publish.yml +93826e24ee7f83d32dc39574505abc5a appstore-build-publish.yml c1476a553c3223e70e49de980f22315e dependabot-approve-merge.yml 2581a67c5bcdcd570427e6d51db767d7 fixup.yml -3ebb059d675980d618b9727fb3792d00 lint-eslint.yml +89736ea5a0440c90b73f5c722a456073 lint-eslint.yml 43fd0c5fb704cabc5f11cdfaf513236d lint-info-xml.yml 79006ab196f5664fc444e63645cfd8a7 lint-php-cs.yml 300be6a756abda800e40850918f2d964 lint-php.yml -d35c01a3f110e52eed0e0c422747a417 lint-stylelint.yml -114bbea1108739b7dd46888e42691563 node-test.yml -1a869a2906ae6d57be06ed83062687ce openapi.yml +69ab1f99e6b290ca48c6ad916fd567cd lint-stylelint.yml +7cf9381a66a8853f634cf52a7da4bb3b node-test.yml +f7a6f6f621446f9da93e4e4e2d3defc0 openapi.yml 6d8eebf482b2932971b7912139f16d9f phpunit-mariadb.yml 3cacf28a710b387e83d3858af40b7ffe phpunit-mysql.yml f89c18551d6a29af9bca63a0fd30a039 phpunit-oci.yml 12a43f55ac6aedc321b62e00f9d864f0 phpunit-pgsql.yml ba5a538fea1a9e53dfcbeb53b83ea6fa phpunit-sqlite.yml -aaa395a26591445ccf4c8196d7f01ee7 pr-feedback.yml +2639f2b96989a4fcbb441ca8f1fecb2f pr-feedback.yml 6c355cb7b5d4da4d56a58e6d7f82881b psalm-matrix.yml c2fc57f15bc64e5066b79a398021ca1a rector-apply.yml 2dbec18233063b42f4d8e03bbb43671c reuse.yml 511439ba27869e0324f283142cc8b3df sync-workflow-templates.yml -28c2966d33e8181bfdbb7b6fbaf9b645 playwright.yml +d47b15109ec7ef7e52fda996796449ed playwright.yml diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index ba35bd80a..27209c291 100644 --- a/.github/workflows/appstore-build-publish.yml +++ b/.github/workflows/appstore-build-publish.yml @@ -59,27 +59,25 @@ jobs: expression: "//info//dependencies//nextcloud/@min-version" - name: Read package.json node and npm engines version - uses: skjnldsv/read-package-engines-version-actions@06d6db44aa62f4609ba070f556ec24bc99fb85cb # v4 + uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0 id: versions # Continue if no package.json continue-on-error: true with: - path: ${{ env.APP_NAME }} - fallbackNode: '^24' - fallbackNpm: '^11.3' + path: ${{ env.APP_NAME }}/package.json - - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + - name: Set up node ${{ steps.versions.outputs.node-version }} # Skip if no package.json - if: ${{ steps.versions.outputs.nodeVersion }} + if: ${{ steps.versions.outcome == 'success' }} uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: - node-version: ${{ steps.versions.outputs.nodeVersion }} + node-version: ${{ steps.versions.outputs.node-version }} package-manager-cache: false - - name: Set up npm ${{ steps.versions.outputs.npmVersion }} + - name: Set up npm ${{ steps.versions.outputs.package-manager-version }} # Skip if no package.json - if: ${{ steps.versions.outputs.npmVersion }} - run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}' + if: ${{ steps.versions.outcome == 'success' }} + run: npm i -g 'npm@${{ steps.versions.outputs.package-manager-version }}' - name: Get php version id: php-versions @@ -111,7 +109,7 @@ jobs: - name: Build ${{ env.APP_NAME }} # Skip if no package.json - if: ${{ steps.versions.outputs.nodeVersion }} + if: ${{ steps.versions.outcome == 'success' }} env: CYPRESS_INSTALL_BINARY: 0 run: | diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml index 317e3c675..43ef34c38 100644 --- a/.github/workflows/lint-eslint.yml +++ b/.github/workflows/lint-eslint.yml @@ -61,19 +61,16 @@ jobs: persist-credentials: false - name: Read package.json node and npm engines version - uses: skjnldsv/read-package-engines-version-actions@06d6db44aa62f4609ba070f556ec24bc99fb85cb # v4 + uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0 id: versions - with: - fallbackNode: '^24' - fallbackNpm: '^11.3' - - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + - name: Set up node ${{ steps.versions.outputs.node-version }} uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: - node-version: ${{ steps.versions.outputs.nodeVersion }} + node-version: ${{ steps.versions.outputs.node-version }} - - name: Set up npm ${{ steps.versions.outputs.npmVersion }} - run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}' + - name: Set up npm ${{ steps.versions.outputs.package-manager-version }} + run: npm i -g 'npm@${{ steps.versions.outputs.package-manager-version }}' - name: Install dependencies env: diff --git a/.github/workflows/lint-stylelint.yml b/.github/workflows/lint-stylelint.yml index 89149dd4e..f648d4135 100644 --- a/.github/workflows/lint-stylelint.yml +++ b/.github/workflows/lint-stylelint.yml @@ -30,19 +30,16 @@ jobs: persist-credentials: false - name: Read package.json node and npm engines version - uses: skjnldsv/read-package-engines-version-actions@06d6db44aa62f4609ba070f556ec24bc99fb85cb # v4 + uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0 id: versions - with: - fallbackNode: '^24' - fallbackNpm: '^11.3' - - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + - name: Set up node ${{ steps.versions.outputs.node-version }} uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: - node-version: ${{ steps.versions.outputs.nodeVersion }} + node-version: ${{ steps.versions.outputs.node-version }} - - name: Set up npm ${{ steps.versions.outputs.npmVersion }} - run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}' + - name: Set up npm ${{ steps.versions.outputs.package-manager-version }} + run: npm i -g 'npm@${{ steps.versions.outputs.package-manager-version }}' - name: Install dependencies env: diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml index c25b088f4..279e84f0f 100644 --- a/.github/workflows/node-test.yml +++ b/.github/workflows/node-test.yml @@ -65,19 +65,16 @@ jobs: persist-credentials: false - name: Read package.json node and npm engines version - uses: skjnldsv/read-package-engines-version-actions@06d6db44aa62f4609ba070f556ec24bc99fb85cb # v4 + uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0 id: versions - with: - fallbackNode: '^24' - fallbackNpm: '^11.3' - - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + - name: Set up node ${{ steps.versions.outputs.node-version }} uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: - node-version: ${{ steps.versions.outputs.nodeVersion }} + node-version: ${{ steps.versions.outputs.node-version }} - - name: Set up npm ${{ steps.versions.outputs.npmVersion }} - run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}' + - name: Set up npm ${{ steps.versions.outputs.package-manager-version }} + run: npm i -g 'npm@${{ steps.versions.outputs.package-manager-version }}' - name: Install dependencies & build env: diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index f8a146097..5df596c19 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -52,26 +52,23 @@ jobs: - name: Read package.json node and npm engines version if: steps.check_typescript_openapi.outputs.files_exists == 'true' - uses: skjnldsv/read-package-engines-version-actions@06d6db44aa62f4609ba070f556ec24bc99fb85cb # v4 + uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0 id: node_versions # Continue if no package.json continue-on-error: true - with: - fallbackNode: '^24' - fallbackNpm: '^11.3' - - name: Set up node ${{ steps.node_versions.outputs.nodeVersion }} - if: ${{ steps.node_versions.outputs.nodeVersion }} + - name: Set up node ${{ steps.node_versions.outputs.node-version }} + if: ${{ steps.node_versions.outcome == 'success' }} uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: - node-version: ${{ steps.node_versions.outputs.nodeVersion }} + node-version: ${{ steps.node_versions.outputs.node-version }} - - name: Set up npm ${{ steps.node_versions.outputs.npmVersion }} - if: ${{ steps.node_versions.outputs.nodeVersion }} - run: npm i -g 'npm@${{ steps.node_versions.outputs.npmVersion }}' + - name: Set up npm ${{ steps.node_versions.outputs.package-manager-version }} + if: ${{ steps.node_versions.outcome == 'success' }} + run: npm i -g 'npm@${{ steps.node_versions.outputs.package-manager-version }}' - name: Install dependencies - if: ${{ steps.node_versions.outputs.nodeVersion }} + if: ${{ steps.node_versions.outcome == 'success' }} env: CYPRESS_INSTALL_BINARY: 0 PUPPETEER_SKIP_DOWNLOAD: true diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 7a9d98f27..24f48f881 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -50,6 +50,16 @@ jobs: - name: Read package.json uses: nextcloud-libraries/parse-package-engines-action@122ae05d4257008180a514e1ddeb0c1b9d094bdd # v0.1.0 id: versions + - name: Check composer.json + id: check_composer + uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0 + with: + files: 'composer.json' + - name: Install composer dependencies + if: steps.check_composer.outputs.files_exists == 'true' + uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 + with: + composer-options: '--no-dev' - name: Set up node uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: diff --git a/.github/workflows/playwright.yml.patch b/.github/workflows/playwright.yml.patch index d14e79fd1..03f94b6fd 100644 --- a/.github/workflows/playwright.yml.patch +++ b/.github/workflows/playwright.yml.patch @@ -1,21 +1,20 @@ diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml -index c218bffb..1e0028ab 100644 +index 6156b86f..24f48f88 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml -@@ -29,10 +29,8 @@ name: Playwright Tests - on: +@@ -30,10 +30,7 @@ on: pull_request: branches: + - main - - master - - stable35 - - stable34 - - stable33 -+ - main + - stable5.4 permissions: contents: read -@@ -125,61 +125,6 @@ jobs: +@@ -138,61 +135,6 @@ jobs: path: blob-report retention-days: 1 diff --git a/.github/workflows/pr-feedback.yml b/.github/workflows/pr-feedback.yml index 1bd9c59ac..e93d2be9b 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-libraries/pr-feedback-action@5227c55be184087d0aef6338bee210d8620b6297 # v1.0.1 + - uses: nextcloud-libraries/pr-feedback-action@4738cf661995d96df3512409ec17c900a4081d33 # v2.0.0 with: feedback-message: | Hello there, @@ -50,6 +50,6 @@ jobs: (If you believe you should not receive this message, you can add yourself to the [blocklist](https://github.com/nextcloud/.github/blob/master/non-community-usernames.txt).) days-before-feedback: 14 - start-date: '2025-06-12' + max-days-overdue: 7 exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }}' exempt-bots: true