diff --git a/.github/actions-lock.txt b/.github/actions-lock.txt index 990c3f7f..09fa59ce 100644 --- a/.github/actions-lock.txt +++ b/.github/actions-lock.txt @@ -2,18 +2,19 @@ # SPDX-License-Identifier: MIT fe1239ed98a163abbdea3e0490c85458 appstore-build-publish.yml 9f2b534bea27e8ec2dda7c1d772a664b block-merge-eol.yml -25fc4c7e69e778e20bdc9eb0cc96367e block-merge-freeze.yml +acad44f3e99b665897766ce90374dd03 block-merge-freeze.yml 7f15fef2fde87aae0eb8386ded489372 command-compile.yml e6351c608939c31ae1e32923aa82aa10 dependabot-approve-merge.yml -985f3ac7d51405c1601c742832a14120 lint-eslint.yml +dc0ae733f35c60274937c2647c027d46 lint-eslint.yml 43fd0c5fb704cabc5f11cdfaf513236d lint-info-xml.yml 4b40dd0073e16f74dd04e6d49dcc043d lint-php-cs.yml cfb31e47b6e9ab65e76c89b028754a4e lint-php.yml ab3a506506b1d7c1cea9593ecfd84366 lint-stylelint.yml 03759c9dc0fa748cb927b9f9cadf2925 node.yml -aff9f466debc652013b43d1a11b32a0b npm-audit-fix.yml -4ca2c2c4b1a73182667bab908e57c185 phpunit-sqlite.yml +0dc931ec237a235370e224282608b20e npm-audit-fix.yml +869cf6703da576578e5d1774aa87d837 phpunit-sqlite.yml d1821b8a816578070ed8fd018f321f6d pr-feedback.yml 6dc046dfbca5dc65d938265c518fcac4 psalm.yml 2dbec18233063b42f4d8e03bbb43671c reuse.yml -f5632e6d28c6afca9d4d46131fb48d57 update-nextcloud-ocp.yml +1919e2ff468e875aeeae5fd088d4ce1f update-nextcloud-ocp.yml +ab958fa2b07234fceab6b6d836fb7f19 npm-build.yml diff --git a/.github/workflows/block-merge-freeze.yml b/.github/workflows/block-merge-freeze.yml index 3a9d5cc3..e6652565 100644 --- a/.github/workflows/block-merge-freeze.yml +++ b/.github/workflows/block-merge-freeze.yml @@ -54,4 +54,4 @@ jobs: - name: Run check if: ${{ env.server_ref != '' }} - run: cat version.php | grep 'OC_VersionString' | grep -i -v 'RC' + run: cat version.php | grep 'OC_VersionString' | grep -i -v -E '(\.0\.0 RC[3-9]|\.[1-9][0-9]* RC)' diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml index f84f2768..5ad2d20e 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@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3 id: changes continue-on-error: true with: diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 928fc930..fd84e64a 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -26,6 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable35' - 'stable34' - 'stable33' - 'stable32' diff --git a/.github/workflows/npm-build.yml b/.github/workflows/npm-build.yml index 1b9e3724..c6085726 100644 --- a/.github/workflows/npm-build.yml +++ b/.github/workflows/npm-build.yml @@ -28,7 +28,7 @@ jobs: src: ${{ steps.changes.outputs.src}} steps: - - uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2 + - uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3 id: changes continue-on-error: true with: diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index cb994fc9..e6516c9f 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@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3 id: changes continue-on-error: true with: 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'