From b5f8ec2551ad23fef163d02d63707f9375728d99 Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Sun, 13 Sep 2026 07:27:58 +0000 Subject: [PATCH 1/3] ci(actions): Update workflow templates from organization template repository Signed-off-by: GitHub --- .github/actions-lock.txt | 24 ++++----- .github/workflows/appstore-build-publish.yml | 4 +- .github/workflows/lint-php-cs.yml | 2 +- .github/workflows/lint-php.yml | 2 +- .github/workflows/phpunit-mariadb.yml | 52 +++++++++---------- .github/workflows/phpunit-mysql.yml | 48 ++++++++--------- .github/workflows/phpunit-oci.yml | 50 +++++++++--------- .github/workflows/phpunit-pgsql.yml | 48 ++++++++--------- .github/workflows/phpunit-sqlite.yml | 50 ++++++++---------- .github/workflows/pr-feedback.yml | 2 +- .github/workflows/psalm.yml | 2 +- .github/workflows/sync-workflow-templates.yml | 1 + .github/workflows/update-nextcloud-ocp.yml | 1 + 13 files changed, 137 insertions(+), 149 deletions(-) diff --git a/.github/actions-lock.txt b/.github/actions-lock.txt index 0a638695..8dcd9dee 100644 --- a/.github/actions-lock.txt +++ b/.github/actions-lock.txt @@ -1,20 +1,20 @@ # SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors # SPDX-License-Identifier: MIT -fe1239ed98a163abbdea3e0490c85458 appstore-build-publish.yml +ed8f08fe0c056080f6afef29f15b2d49 appstore-build-publish.yml e6351c608939c31ae1e32923aa82aa10 dependabot-approve-merge.yml 2581a67c5bcdcd570427e6d51db767d7 fixup.yml 43fd0c5fb704cabc5f11cdfaf513236d lint-info-xml.yml -4b40dd0073e16f74dd04e6d49dcc043d lint-php-cs.yml -cfb31e47b6e9ab65e76c89b028754a4e lint-php.yml -076e72a19e7bdf35ac5b2abee0198c43 phpunit-mariadb.yml -8fab08ac7da700ee304af0bf3c18b3a3 phpunit-mysql.yml -bbe9834ddb89207caf5e19d79ebb3672 phpunit-oci.yml -256bf1dead4ef8479e9ce7433f871548 phpunit-pgsql.yml -4ca2c2c4b1a73182667bab908e57c185 phpunit-sqlite.yml -d1821b8a816578070ed8fd018f321f6d pr-feedback.yml -6dc046dfbca5dc65d938265c518fcac4 psalm.yml +79006ab196f5664fc444e63645cfd8a7 lint-php-cs.yml +300be6a756abda800e40850918f2d964 lint-php.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 +4f1080b33778a956a08efc7a41a11994 psalm.yml 2dbec18233063b42f4d8e03bbb43671c reuse.yml -94c65e30a77686c079c6dfa54a008440 sync-workflow-templates.yml +b47a9fe981a7435caea92db33f5ad121 sync-workflow-templates.yml a3440826636c0fd7c2d20b1de50363da update-nextcloud-ocp-approve-merge.yml -f5632e6d28c6afca9d4d46131fb48d57 update-nextcloud-ocp.yml +1919e2ff468e875aeeae5fd088d4ce1f update-nextcloud-ocp.yml 22604c31b526de270a080eb19967a638 update-stable-titles.yml diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index c90f1332..699f6d69 100644 --- a/.github/workflows/appstore-build-publish.yml +++ b/.github/workflows/appstore-build-publish.yml @@ -83,7 +83,7 @@ jobs: - name: Get php version id: php-versions - uses: icewind1991/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 + uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 with: filename: ${{ env.APP_NAME }}/appinfo/info.xml @@ -194,7 +194,7 @@ jobs: overwrite: true - name: Upload app to Nextcloud appstore - uses: nextcloud-releases/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1 # v1.0.3 + uses: nextcloud-libraries/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1 # v1.0.3 with: app_name: ${{ env.APP_NAME }} appstore_token: ${{ secrets.APPSTORE_TOKEN }} diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index bcb4ca72..06d0842f 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -31,7 +31,7 @@ jobs: - name: Get php version id: versions - uses: icewind1991/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 + uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 - name: Set up php${{ steps.versions.outputs.php-min }} uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index b6ea62d1..e4c6e9ba 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -31,7 +31,7 @@ jobs: - name: Get version matrix id: versions - uses: icewind1991/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 + uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 php-lint: runs-on: ubuntu-latest-low diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index fd5e0617..b6784ec0 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -18,29 +18,16 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest-low - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 - - changes: + changes-and-matrix: runs-on: ubuntu-latest-low permissions: contents: read pull-requests: read outputs: - src: ${{ steps.changes.outputs.src}} + src: ${{ steps.changes.outputs.src }} + php-version: ${{ steps.versions.outputs.php-available-list }} + server-max: ${{ steps.versions.outputs.branches-max-list }} steps: - uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3 @@ -60,20 +47,31 @@ jobs: - 'composer.json' - 'composer.lock' + - name: Checkout app + if: steps.changes.outputs.src != 'false' + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + + - name: Get version matrix + if: steps.changes.outputs.src != 'false' + id: versions + uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 + phpunit-mariadb: runs-on: ubuntu-latest - needs: [changes, matrix] - if: needs.changes.outputs.src != 'false' + needs: changes-and-matrix + if: needs.changes-and-matrix.outputs.src != 'false' strategy: fail-fast: false matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} + server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} mariadb-versions: ['10.6', '11.4'] - richdocuments-versions: ['stable35'] - groupfolders-versions: ['stable35'] + richdocuments-versions: ['main'] + groupfolders-versions: ['master'] name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} @@ -108,7 +106,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Checkout app (richdocuments) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/richdocuments @@ -116,7 +114,7 @@ jobs: ref: ${{ matrix.richdocuments-versions }} - name: Checkout app (groupfolders) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/groupfolders @@ -222,7 +220,7 @@ jobs: permissions: contents: none runs-on: ubuntu-latest-low - needs: [changes, phpunit-mariadb] + needs: [changes-and-matrix, phpunit-mariadb] if: always() @@ -230,4 +228,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-mariadb.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes-and-matrix.outputs.src != 'false' && needs.phpunit-mariadb.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index ccca6852..d8634c52 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -18,30 +18,15 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest-low - outputs: - matrix: ${{ steps.versions.outputs.sparse-matrix }} - steps: - - name: Checkout app - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 - with: - matrix: '{"mysql-versions": ["8.4"], "richdocuments-versions": ["stable35"], "groupfolders-versions": ["stable35"]}' - - changes: + changes-and-matrix: runs-on: ubuntu-latest-low permissions: contents: read pull-requests: read outputs: - src: ${{ steps.changes.outputs.src}} + src: ${{ steps.changes.outputs.src }} + matrix: ${{ steps.versions.outputs.sparse-matrix }} steps: - uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3 @@ -61,15 +46,28 @@ jobs: - 'composer.json' - 'composer.lock' + - name: Checkout app + if: steps.changes.outputs.src != 'false' + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + + - name: Get version matrix + if: steps.changes.outputs.src != 'false' + id: versions + uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 + with: + matrix: '{"mysql-versions": ["8.4"], "richdocuments-versions": ["main"], "groupfolders-versions": ["master"]}' + phpunit-mysql: runs-on: ubuntu-latest - needs: [changes, matrix] - if: needs.changes.outputs.src != 'false' + needs: changes-and-matrix + if: needs.changes-and-matrix.outputs.src != 'false' strategy: fail-fast: false - matrix: ${{ fromJson(needs.matrix.outputs.matrix) }} + matrix: ${{ fromJson(needs.changes-and-matrix.outputs.matrix) }} name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} @@ -104,7 +102,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Checkout app (richdocuments) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/richdocuments @@ -112,7 +110,7 @@ jobs: ref: ${{ matrix.richdocuments-versions }} - name: Checkout app (groupfolders) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/groupfolders @@ -218,7 +216,7 @@ jobs: permissions: contents: none runs-on: ubuntu-latest-low - needs: [changes, phpunit-mysql] + needs: [changes-and-matrix, phpunit-mysql] if: always() @@ -226,4 +224,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes-and-matrix.outputs.src != 'false' && needs.phpunit-mysql.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index 9da9f4ca..ea067731 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -18,22 +18,7 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest-low - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 - - changes: + changes-and-matrix: runs-on: ubuntu-latest-low permissions: contents: read @@ -41,6 +26,8 @@ jobs: outputs: src: ${{ steps.changes.outputs.src }} + php-version: ${{ steps.versions.outputs.php-available-list }} + server-max: ${{ steps.versions.outputs.branches-max-list }} steps: - uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3 @@ -60,20 +47,31 @@ jobs: - 'composer.json' - 'composer.lock' + - name: Checkout app + if: steps.changes.outputs.src != 'false' + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + + - name: Get version matrix + if: steps.changes.outputs.src != 'false' + id: versions + uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 + phpunit-oci: runs-on: ubuntu-latest - needs: [changes, matrix] - if: needs.changes.outputs.src != 'false' + needs: changes-and-matrix + if: needs.changes-and-matrix.outputs.src != 'false' strategy: fail-fast: false matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} + php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} + server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} oci-versions: ['18', '21', '23'] - richdocuments-versions: ['stable35'] - groupfolders-versions: ['stable35'] + richdocuments-versions: ['main'] + groupfolders-versions: ['master'] name: OCI ${{ matrix.oci-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} @@ -118,7 +116,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Checkout app (richdocuments) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/richdocuments @@ -126,7 +124,7 @@ jobs: ref: ${{ matrix.richdocuments-versions }} - name: Checkout app (groupfolders) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/groupfolders @@ -227,7 +225,7 @@ jobs: permissions: contents: none runs-on: ubuntu-latest-low - needs: [changes, phpunit-oci] + needs: [changes-and-matrix, phpunit-oci] if: always() @@ -235,4 +233,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-oci.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes-and-matrix.outputs.src != 'false' && needs.phpunit-oci.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index b55adcb0..3e1836e1 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -18,22 +18,7 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest-low - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 - - changes: + changes-and-matrix: runs-on: ubuntu-latest-low permissions: contents: read @@ -41,6 +26,8 @@ jobs: outputs: src: ${{ steps.changes.outputs.src }} + php-version: ${{ steps.versions.outputs.php-available-list }} + server-max: ${{ steps.versions.outputs.branches-max-list }} steps: - uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3 @@ -60,19 +47,28 @@ jobs: - 'composer.json' - 'composer.lock' + - name: Checkout app + if: steps.changes.outputs.src != 'false' + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + + - name: Get version matrix + if: steps.changes.outputs.src != 'false' + id: versions + uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 + phpunit-pgsql: runs-on: ubuntu-latest - needs: [changes, matrix] - if: needs.changes.outputs.src != 'false' + needs: changes-and-matrix + if: needs.changes-and-matrix.outputs.src != 'false' strategy: fail-fast: false matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} - richdocuments-versions: ['stable35'] - groupfolders-versions: ['stable35'] + php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} + server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} name: PostgreSQL PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} @@ -109,7 +105,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Checkout app (richdocuments) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/richdocuments @@ -117,7 +113,7 @@ jobs: ref: ${{ matrix.richdocuments-versions }} - name: Checkout app (groupfolders) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/groupfolders @@ -218,7 +214,7 @@ jobs: permissions: contents: none runs-on: ubuntu-latest-low - needs: [changes, phpunit-pgsql] + needs: [changes-and-matrix, phpunit-pgsql] if: always() @@ -226,4 +222,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes-and-matrix.outputs.src != 'false' && needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 49563297..412effea 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -18,29 +18,16 @@ concurrency: cancel-in-progress: true jobs: - matrix: - runs-on: ubuntu-latest-low - outputs: - php-version: ${{ steps.versions.outputs.php-available-list }} - server-max: ${{ steps.versions.outputs.branches-max-list }} - steps: - - name: Checkout app - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - - - name: Get version matrix - id: versions - uses: icewind1991/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 - - changes: + changes-and-matrix: runs-on: ubuntu-latest-low permissions: contents: read pull-requests: read outputs: - src: ${{ steps.changes.outputs.src}} + src: ${{ steps.changes.outputs.src }} + php-version: ${{ steps.versions.outputs.php-available-list }} + server-max: ${{ steps.versions.outputs.branches-max-list }} steps: - uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3 @@ -60,19 +47,28 @@ jobs: - 'composer.json' - 'composer.lock' + - name: Checkout app + if: steps.changes.outputs.src != 'false' + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + + - name: Get version matrix + if: steps.changes.outputs.src != 'false' + id: versions + uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 + phpunit-sqlite: runs-on: ubuntu-latest - needs: [changes, matrix] - if: needs.changes.outputs.src != 'false' + needs: changes-and-matrix + if: needs.changes-and-matrix.outputs.src != 'false' strategy: fail-fast: false matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} - richdocuments-versions: ['stable35'] - groupfolders-versions: ['stable35'] + php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} + server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} @@ -98,7 +94,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Checkout app (richdocuments) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/richdocuments @@ -106,7 +102,7 @@ jobs: ref: ${{ matrix.richdocuments-versions }} - name: Checkout app (groupfolders) - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: persist-credentials: false path: apps/groupfolders @@ -207,7 +203,7 @@ jobs: permissions: contents: none runs-on: ubuntu-latest-low - needs: [changes, phpunit-sqlite] + needs: [changes-and-matrix, phpunit-sqlite] if: always() @@ -215,4 +211,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes-and-matrix.outputs.src != 'false' && needs.phpunit-sqlite.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/pr-feedback.yml b/.github/workflows/pr-feedback.yml index 4420bf69..1bd9c59a 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@5227c55be184087d0aef6338bee210d8620b6297 # v1.0.1 + - uses: nextcloud-libraries/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 7633e39a..d6e2d52f 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -30,7 +30,7 @@ jobs: - name: Get php version id: versions - uses: icewind1991/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 + uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 - name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml diff --git a/.github/workflows/sync-workflow-templates.yml b/.github/workflows/sync-workflow-templates.yml index 0e925bb8..4f529693 100644 --- a/.github/workflows/sync-workflow-templates.yml +++ b/.github/workflows/sync-workflow-templates.yml @@ -26,6 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable35' - 'stable34' - 'stable33' - 'stable32' diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index f09ae8f9..2d359af4 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -29,6 +29,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable35' - 'stable34' - 'stable33' - 'stable32' From 6b583bad7faa36f62e16680cbf01ec988e8657bb Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 15 Sep 2026 16:12:36 +0200 Subject: [PATCH 2/3] ci(workflows): Adjust patches Signed-off-by: Joas Schilling --- .github/workflows/phpunit-mariadb.yml.patch | 4 ++-- .github/workflows/phpunit-mysql.yml.patch | 2 +- .github/workflows/phpunit-oci.yml.patch | 4 ++-- .github/workflows/phpunit-pgsql.yml.patch | 8 ++++---- .github/workflows/phpunit-sqlite.yml.patch | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/phpunit-mariadb.yml.patch b/.github/workflows/phpunit-mariadb.yml.patch index 512f990b..6ea0e9e2 100644 --- a/.github/workflows/phpunit-mariadb.yml.patch +++ b/.github/workflows/phpunit-mariadb.yml.patch @@ -6,8 +6,8 @@ index 5f8501e..8de1fcc 100644 php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} mariadb-versions: ['10.6', '11.4'] -+ richdocuments-versions: ['main'] -+ groupfolders-versions: ['master'] ++ richdocuments-versions: ['stable35'] ++ groupfolders-versions: ['stable35'] name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/phpunit-mysql.yml.patch b/.github/workflows/phpunit-mysql.yml.patch index 90056e5a..be7b9fdf 100644 --- a/.github/workflows/phpunit-mysql.yml.patch +++ b/.github/workflows/phpunit-mysql.yml.patch @@ -7,7 +7,7 @@ index fcc0750..ada49fc 100644 uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2 with: - matrix: '{"mysql-versions": ["8.4"]}' -+ matrix: '{"mysql-versions": ["8.4"], "richdocuments-versions": ["main"], "groupfolders-versions": ["master"]}' ++ matrix: '{"mysql-versions": ["8.4"], "richdocuments-versions": ["stable35"], "groupfolders-versions": ["stable35"]}' changes: runs-on: ubuntu-latest-low diff --git a/.github/workflows/phpunit-oci.yml.patch b/.github/workflows/phpunit-oci.yml.patch index 521c3852..a68ab69d 100644 --- a/.github/workflows/phpunit-oci.yml.patch +++ b/.github/workflows/phpunit-oci.yml.patch @@ -6,8 +6,8 @@ index 5eadd44..b81f8ee 100644 php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} oci-versions: ['18', '21', '23'] -+ richdocuments-versions: ['main'] -+ groupfolders-versions: ['master'] ++ richdocuments-versions: ['stable35'] ++ groupfolders-versions: ['stable35'] name: OCI ${{ matrix.oci-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/phpunit-pgsql.yml.patch b/.github/workflows/phpunit-pgsql.yml.patch index 5679e2cd..6946d316 100644 --- a/.github/workflows/phpunit-pgsql.yml.patch +++ b/.github/workflows/phpunit-pgsql.yml.patch @@ -4,10 +4,10 @@ index e703479..7b2dfe9 100644 +++ b/.github/workflows/phpunit-pgsql.yml @@ -70,6 +70,8 @@ jobs: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} -+ richdocuments-versions: ['main'] -+ groupfolders-versions: ['master'] + php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} + server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} ++ richdocuments-versions: ['stable35'] ++ groupfolders-versions: ['stable35'] name: PostgreSQL PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/phpunit-sqlite.yml.patch b/.github/workflows/phpunit-sqlite.yml.patch index e2a99207..1e3a8021 100644 --- a/.github/workflows/phpunit-sqlite.yml.patch +++ b/.github/workflows/phpunit-sqlite.yml.patch @@ -4,10 +4,10 @@ index e7baa9e..0f6b7fc 100644 +++ b/.github/workflows/phpunit-sqlite.yml @@ -70,6 +70,8 @@ jobs: matrix: - php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }} - server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }} -+ richdocuments-versions: ['main'] -+ groupfolders-versions: ['master'] + php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} + server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} ++ richdocuments-versions: ['stable35'] ++ groupfolders-versions: ['stable35'] name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} From eb0d6cfb5604166da776087338755dea096c1c20 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 15 Sep 2026 16:14:31 +0200 Subject: [PATCH 3/3] ci(actions): Update workflow templates from organization template repository Signed-off-by: Joas Schilling --- .github/workflows/phpunit-mariadb.yml | 4 ++-- .github/workflows/phpunit-mysql.yml | 2 +- .github/workflows/phpunit-oci.yml | 4 ++-- .github/workflows/phpunit-pgsql.yml | 2 ++ .github/workflows/phpunit-sqlite.yml | 2 ++ .github/workflows/sync-workflow-templates.yml | 1 - .github/workflows/update-nextcloud-ocp.yml | 1 - 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index b6784ec0..8c2103b9 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -70,8 +70,8 @@ jobs: php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} mariadb-versions: ['10.6', '11.4'] - richdocuments-versions: ['main'] - groupfolders-versions: ['master'] + richdocuments-versions: ['stable35'] + groupfolders-versions: ['stable35'] name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index d8634c52..64867b74 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -57,7 +57,7 @@ jobs: id: versions uses: nextcloud-libraries/nextcloud-version-matrix@cd0211ffcef1065e2020cd579e4843b8746e7a58 # v1.3.3 with: - matrix: '{"mysql-versions": ["8.4"], "richdocuments-versions": ["main"], "groupfolders-versions": ["master"]}' + matrix: '{"mysql-versions": ["8.4"], "richdocuments-versions": ["stable35"], "groupfolders-versions": ["stable35"]}' phpunit-mysql: runs-on: ubuntu-latest diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index ea067731..445b41d0 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -70,8 +70,8 @@ jobs: php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} oci-versions: ['18', '21', '23'] - richdocuments-versions: ['main'] - groupfolders-versions: ['master'] + richdocuments-versions: ['stable35'] + groupfolders-versions: ['stable35'] name: OCI ${{ matrix.oci-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 3e1836e1..f3454012 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -69,6 +69,8 @@ jobs: matrix: php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} + richdocuments-versions: ['stable35'] + groupfolders-versions: ['stable35'] name: PostgreSQL PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 412effea..a0a7edb8 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -69,6 +69,8 @@ jobs: matrix: php-versions: ${{ fromJson(needs.changes-and-matrix.outputs.php-version) }} server-versions: ${{ fromJson(needs.changes-and-matrix.outputs.server-max) }} + richdocuments-versions: ['stable35'] + groupfolders-versions: ['stable35'] name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }} diff --git a/.github/workflows/sync-workflow-templates.yml b/.github/workflows/sync-workflow-templates.yml index 4f529693..40d39e1f 100644 --- a/.github/workflows/sync-workflow-templates.yml +++ b/.github/workflows/sync-workflow-templates.yml @@ -29,7 +29,6 @@ jobs: - 'stable35' - 'stable34' - 'stable33' - - 'stable32' name: Update workflows in ${{ matrix.branches }} diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index 2d359af4..3b60a2e7 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -32,7 +32,6 @@ jobs: - 'stable35' - 'stable34' - 'stable33' - - 'stable32' name: update-nextcloud-ocp-${{ matrix.branches }}