diff --git a/.github/workflows/block-merge-eol.yml b/.github/workflows/block-merge-eol.yml index fa07ca3b..3ea4d268 100644 --- a/.github/workflows/block-merge-eol.yml +++ b/.github/workflows/block-merge-eol.yml @@ -27,15 +27,23 @@ jobs: steps: - name: Set server major version environment - run: | - # retrieve version number from branch reference - server_major=$(echo "${{ github.base_ref }}" | sed -En 's/stable//p') - echo "server_major=$server_major" >> $GITHUB_ENV - echo "current_month=$(date +%Y-%m)" >> $GITHUB_ENV - - - name: Checking if ${{ env.server_major }} is EOL + uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const regex = /^stable(\d+)$/ + const baseRef = context.payload.pull_request.base.ref + const match = baseRef.match(regex) + if (match) { + console.log('Setting server_major to ' + match[1]); + core.exportVariable('server_major', match[1]); + console.log('Setting current_day to ' + (new Date()).toISOString().substr(0, 10)); + core.exportVariable('current_day', (new Date()).toISOString().substr(0, 10)); + } + + - name: Checking if server ${{ env.server_major }} is EOL + if: ${{ env.server_major != '' }} run: | curl -s https://raw.githubusercontent.com/nextcloud-releases/updater_server/production/config/major_versions.json \ - | jq '.["${{ env.server_major }}"]["eol"] // "9999-99" | . >= "${{ env.current_month }}"' \ + | jq '.["${{ env.server_major }}"]["eol"] // "9999-99-99" | . >= "${{ env.current_day }}"' \ | grep -q true - diff --git a/.github/workflows/block-merge-freeze.yml b/.github/workflows/block-merge-freeze.yml index b7089861..61660808 100644 --- a/.github/workflows/block-merge-freeze.yml +++ b/.github/workflows/block-merge-freeze.yml @@ -29,12 +29,29 @@ jobs: steps: - name: Register server reference to fallback to master branch - run: | - server_ref="$(if [ '${{ github.base_ref }}' = 'main' ]; then echo -n 'master'; else echo -n '${{ github.base_ref }}'; fi)" - echo "server_ref=$server_ref" >> $GITHUB_ENV + uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const baseRef = context.payload.pull_request.base.ref + if (baseRef === 'main' || baseRef === 'master') { + core.exportVariable('server_ref', 'master'); + console.log('Setting server_ref to master'); + } else { + const regex = /^stable(\d+)$/ + const match = baseRef.match(regex) + if (match) { + core.exportVariable('server_ref', match[0]); + console.log('Setting server_ref to ' + match[0]); + } else { + console.log('Not based on master/main/stable*, so skipping freeze check'); + } + } + - name: Download version.php from ${{ env.server_ref }} + if: ${{ env.server_ref != '' }} run: curl 'https://raw.githubusercontent.com/nextcloud/server/${{ env.server_ref }}/version.php' --output version.php - name: Run check + if: ${{ env.server_ref != '' }} run: cat version.php | grep 'OC_VersionString' | grep -i -v 'RC' - diff --git a/.github/workflows/command-compile.yml b/.github/workflows/command-compile.yml index 709b0519..cf4761a1 100644 --- a/.github/workflows/command-compile.yml +++ b/.github/workflows/command-compile.yml @@ -11,9 +11,12 @@ on: issue_comment: types: [created] +permissions: + contents: read + jobs: init: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-low # On pull requests and if the comment starts with `/compile` if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/compile') @@ -76,7 +79,7 @@ jobs: fi - name: Init branch - uses: xt0rted/pull-request-comment-branch@d97294d304604fa98a2600a6e2f916a84b596dc7 # v1 + uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1 # v3.0.0 id: comment-branch - name: Add reaction on failure @@ -94,14 +97,16 @@ jobs: steps: - name: Restore cached git repository - uses: buildjet/cache/save@v4 + uses: buildjet/cache@3e70d19e31d6a8030aeddf6ed8dbe601f94d09f4 # v4.0.2 with: path: .git key: git-repo - name: Checkout ${{ needs.init.outputs.head_ref }} - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: + # Needed to allow force push later + persist-credentials: true token: ${{ secrets.COMMAND_BOT_PAT }} fetch-depth: 0 ref: ${{ needs.init.outputs.head_ref }} @@ -115,11 +120,11 @@ jobs: uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3 id: package-engines-versions with: - fallbackNode: '^20' - fallbackNpm: '^10' + fallbackNode: '^24' + fallbackNpm: '^11.3' - name: Set up node ${{ steps.package-engines-versions.outputs.nodeVersion }} - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 + uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0 with: node-version: ${{ steps.package-engines-versions.outputs.nodeVersion }} cache: npm @@ -131,7 +136,41 @@ jobs: if: ${{ contains(needs.init.outputs.arg1, 'rebase') }} run: | git fetch origin '${{ needs.init.outputs.base_ref }}:${{ needs.init.outputs.base_ref }}' - git rebase 'origin/${{ needs.init.outputs.base_ref }}' + + # Start the rebase + git rebase 'origin/${{ needs.init.outputs.base_ref }}' || { + # Handle rebase conflicts in a loop + while [ -d .git/rebase-merge ] || [ -d .git/rebase-apply ]; do + echo "Handling rebase conflict..." + + # Remove and checkout /dist and /js folders from the base branch + if [ -d "dist" ]; then + rm -rf dist + git checkout origin/${{ needs.init.outputs.base_ref }} -- dist/ 2>/dev/null || echo "No dist folder in base branch" + fi + if [ -d "js" ]; then + rm -rf js + git checkout origin/${{ needs.init.outputs.base_ref }} -- js/ 2>/dev/null || echo "No js folder in base branch" + fi + + # Stage all changes + git add . + + # Check if there are any changes after resolving conflicts + if git diff --cached --quiet; then + echo "No changes after conflict resolution, skipping commit" + git rebase --skip + else + echo "Changes found, continuing rebase without editing commit message" + git -c core.editor=true rebase --continue + fi + + # Break if rebase is complete + if [ ! -d .git/rebase-merge ] && [ ! -d .git/rebase-apply ]; then + break + fi + done + } - name: Install dependencies & build env: @@ -163,11 +202,15 @@ jobs: - name: Push normally if: ${{ !contains(needs.init.outputs.arg1, 'rebase') && !contains(needs.init.outputs.arg1, 'amend') }} - run: git push origin '${{ needs.init.outputs.head_ref }}' + env: + HEAD_REF: ${{ needs.init.outputs.head_ref }} + run: git push origin "$HEAD_REF" - name: Force push if: ${{ contains(needs.init.outputs.arg1, 'rebase') || contains(needs.init.outputs.arg1, 'amend') }} - run: git push --force origin '${{ needs.init.outputs.head_ref }}' + env: + HEAD_REF: ${{ needs.init.outputs.head_ref }} + run: git push --force-with-lease origin "$HEAD_REF" - name: Add reaction on failure uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 @@ -177,4 +220,3 @@ jobs: repository: ${{ github.event.repository.full_name }} comment-id: ${{ github.event.comment.id }} reactions: '-1' - diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 627eeee1..f167ffb8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,7 +21,9 @@ jobs: name: info.xml lint steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + with: + persist-credentials: false - name: Download xml appinfo schema run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd @@ -40,7 +42,9 @@ jobs: php-versions: ["8.1"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + with: + persist-credentials: false - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@v2 @@ -59,7 +63,9 @@ jobs: php-versions: ["8.1"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + with: + persist-credentials: false - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@v2 @@ -81,7 +87,10 @@ jobs: name: php-psalm-analysis steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + with: + persist-credentials: false + - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@v2 with: @@ -123,7 +132,10 @@ jobs: name: eslint steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + with: + persist-credentials: false + - name: Install dependencies run: npm ci @@ -136,7 +148,10 @@ jobs: name: stylelint steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + with: + persist-credentials: false + - name: Install dependencies run: npm ci diff --git a/.github/workflows/node-build.yml b/.github/workflows/node-build.yml index ca6dbb1d..5e2d2dc1 100644 --- a/.github/workflows/node-build.yml +++ b/.github/workflows/node-build.yml @@ -18,6 +18,9 @@ on: - stylelint.config.js - webpack.js +permissions: + contents: read + jobs: build: name: node-build @@ -30,6 +33,7 @@ jobs: - name: Checkout uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # with: + persist-credentials: false path: ${{ env.APP_NAME }} - name: Read package.json node and npm engines version @@ -43,6 +47,7 @@ jobs: - name: Set up node ${{ steps.versions.outputs.nodeVersion }} uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3 with: + persist-credentials: false node-version: ${{ steps.versions.outputs.nodeVersion }} - name: Set up npm ${{ steps.versions.outputs.npmVersion }} diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 0b82c9eb..4f432f68 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -53,23 +53,31 @@ jobs: name: NPM build steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + persist-credentials: false - name: Read package.json node and npm engines version uses: skjnldsv/read-package-engines-version-actions@06d6baf7d8f41934ab630e97d9e6c0bc9c9ac5e4 # v3 id: versions with: - fallbackNode: '^20' - fallbackNpm: '^10' + fallbackNode: '^24' + fallbackNpm: '^11.3' - name: Set up node ${{ steps.versions.outputs.nodeVersion }} - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 + uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0 with: node-version: ${{ steps.versions.outputs.nodeVersion }} - name: Set up npm ${{ steps.versions.outputs.npmVersion }} run: npm i -g 'npm@${{ steps.versions.outputs.npmVersion }}' + - name: Validate package-lock.json # See https://github.com/npm/cli/issues/4460 + run: | + npm i -g npm-package-lock-add-resolved@1.1.4 + npm-package-lock-add-resolved + git --no-pager diff --exit-code + - name: Install dependencies & build env: CYPRESS_INSTALL_BINARY: 0 @@ -78,7 +86,7 @@ jobs: npm ci npm run build --if-present - - name: Check webpack build changes + - name: Check build changes run: | bash -c "[[ ! \"`git status --porcelain `\" ]] || (echo 'Please recompile and commit the assets, see the section \"Show changes on failure\" for details' && exit 1)" diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index b6828556..0cd21efa 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -11,12 +11,15 @@ name: REUSE Compliance Check on: [pull_request] +permissions: + contents: read + jobs: reuse-compliance-check: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-low steps: - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false diff --git a/.github/workflows/tests-deploy.yml b/.github/workflows/tests-deploy.yml index 86582710..ba058d7f 100644 --- a/.github/workflows/tests-deploy.yml +++ b/.github/workflows/tests-deploy.yml @@ -23,7 +23,7 @@ jobs: services: postgres: - image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest # zizmor: ignore[unpinned-images] ports: - 4444:5432/tcp env: @@ -39,6 +39,7 @@ jobs: - name: Checkout server uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false submodules: true repository: nextcloud/server ref: stable31 @@ -46,6 +47,7 @@ jobs: - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false path: apps/${{ env.APP_NAME }} - name: Set up php @@ -570,7 +572,7 @@ jobs: services: postgres: - image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest # zizmor: ignore[unpinned-images] ports: - 4444:5432/tcp env: @@ -579,7 +581,7 @@ jobs: POSTGRES_DB: nextcloud options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5 redis: - image: redis + image: redis # zizmor: ignore[unpinned-images] options: >- --health-cmd "redis-cli ping" --health-interval 10s @@ -596,6 +598,7 @@ jobs: - name: Checkout server uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false submodules: true repository: nextcloud/server ref: stable31 @@ -603,6 +606,7 @@ jobs: - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false path: apps/${{ env.APP_NAME }} - name: Set up php @@ -710,7 +714,7 @@ jobs: services: postgres: - image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest # zizmor: ignore[unpinned-images] ports: - 4444:5432/tcp env: @@ -719,7 +723,7 @@ jobs: POSTGRES_DB: nextcloud options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5 redis: - image: redis + image: redis # zizmor: ignore[unpinned-images] options: >- --health-cmd "redis-cli ping" --health-interval 10s @@ -736,6 +740,7 @@ jobs: - name: Checkout server uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false submodules: true repository: nextcloud/server ref: stable31 @@ -743,6 +748,7 @@ jobs: - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false path: apps/${{ env.APP_NAME }} - name: Set up php 8.3 @@ -870,7 +876,7 @@ jobs: services: postgres: - image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest # zizmor: ignore[unpinned-images] ports: - 4444:5432/tcp env: @@ -886,6 +892,7 @@ jobs: - name: Checkout server uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false submodules: true repository: nextcloud/server ref: stable31 @@ -893,6 +900,7 @@ jobs: - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false path: apps/${{ env.APP_NAME }} - name: Set up php diff --git a/.github/workflows/tests-special.yml b/.github/workflows/tests-special.yml index 0eac58c1..03bfcfc5 100644 --- a/.github/workflows/tests-special.yml +++ b/.github/workflows/tests-special.yml @@ -31,7 +31,7 @@ jobs: services: postgres: - image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest # zizmor: ignore[unpinned-images] ports: - 4444:5432/tcp env: @@ -51,6 +51,7 @@ jobs: - name: Checkout server uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false submodules: true repository: nextcloud/server ref: stable31 @@ -58,6 +59,7 @@ jobs: - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false path: apps/${{ env.APP_NAME }} - name: Set up php @@ -97,6 +99,7 @@ jobs: - name: Checkout NcPyApi uses: actions/checkout@v4 with: + persist-credentials: false path: nc_py_api repository: cloud-py-api/nc_py_api diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 12c8dc94..3e480193 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,7 +33,7 @@ jobs: services: postgres: - image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest # zizmor: ignore[unpinned-images] ports: - 4444:5432/tcp env: @@ -53,6 +53,7 @@ jobs: - name: Checkout server uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false submodules: true repository: nextcloud/server ref: stable31 @@ -60,6 +61,7 @@ jobs: - name: Checkout Notifications uses: actions/checkout@v4 with: + persist-credentials: false repository: nextcloud/notifications ref: stable31 path: apps/notifications @@ -67,8 +69,17 @@ jobs: - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false path: apps/${{ env.APP_NAME }} + - name: Checkout Notes + uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + with: + persist-credentials: false + repository: nextcloud/notes + ref: "main" + path: apps/notes + - name: Set up php uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2 with: @@ -108,6 +119,7 @@ jobs: - name: Checkout NcPyApi uses: actions/checkout@v4 with: + persist-credentials: false path: nc_py_api repository: cloud-py-api/nc_py_api @@ -144,7 +156,7 @@ jobs: services: mysql: - image: ghcr.io/nextcloud/continuous-integration-mysql-8.3:latest + image: ghcr.io/nextcloud/continuous-integration-mysql-8.3:latest # zizmor: ignore[unpinned-images] ports: - 4444:3306/tcp env: @@ -162,6 +174,7 @@ jobs: - name: Checkout server uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false submodules: true repository: nextcloud/server ref: stable31 @@ -169,6 +182,7 @@ jobs: - name: Checkout Notifications uses: actions/checkout@v4 with: + persist-credentials: false repository: nextcloud/notifications ref: stable31 path: apps/notifications @@ -176,6 +190,7 @@ jobs: - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false path: apps/${{ env.APP_NAME }} - name: Set up php @@ -222,6 +237,7 @@ jobs: - name: Checkout NcPyApi uses: actions/checkout@v4 with: + persist-credentials: false path: nc_py_api repository: cloud-py-api/nc_py_api @@ -258,7 +274,7 @@ jobs: services: mysql: - image: ghcr.io/nextcloud/continuous-integration-mysql-8.3:latest + image: ghcr.io/nextcloud/continuous-integration-mysql-8.3:latest # zizmor: ignore[unpinned-images] ports: - 4444:3306/tcp env: @@ -276,6 +292,7 @@ jobs: - name: Checkout server uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false submodules: true repository: nextcloud/server ref: stable31 @@ -283,6 +300,7 @@ jobs: - name: Checkout Notifications uses: actions/checkout@v4 with: + persist-credentials: false repository: nextcloud/notifications ref: stable31 path: apps/notifications @@ -290,6 +308,7 @@ jobs: - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false path: apps/${{ env.APP_NAME }} - name: Set up php @@ -339,6 +358,7 @@ jobs: - name: Checkout NcPyApi uses: actions/checkout@v4 with: + persist-credentials: false path: nc_py_api repository: cloud-py-api/nc_py_api @@ -399,6 +419,7 @@ jobs: - name: Checkout server uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false submodules: true repository: nextcloud/server ref: stable31 @@ -406,6 +427,7 @@ jobs: - name: Checkout Notifications uses: actions/checkout@v4 with: + persist-credentials: false repository: nextcloud/notifications ref: stable31 path: apps/notifications @@ -413,6 +435,7 @@ jobs: - name: Checkout AppAPI uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: + persist-credentials: false path: apps/${{ env.APP_NAME }} - name: Set up php @@ -451,6 +474,7 @@ jobs: - name: Checkout NcPyApi uses: actions/checkout@v4 with: + persist-credentials: false path: nc_py_api repository: cloud-py-api/nc_py_api diff --git a/js/app_api-adminSettings.js.license b/js/app_api-adminSettings.js.license index 554cf28e..f2245172 100644 --- a/js/app_api-adminSettings.js.license +++ b/js/app_api-adminSettings.js.license @@ -5,7 +5,6 @@ SPDX-License-Identifier: BSD-3-Clause SPDX-License-Identifier: BSD-2-Clause SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: (MPL-2.0 OR Apache-2.0) -SPDX-License-Identifier: ( AGPL-3.0-or-later) SPDX-FileCopyrightText: xiaokai SPDX-FileCopyrightText: rhysd SPDX-FileCopyrightText: inline-style-parser developers @@ -48,7 +47,6 @@ SPDX-FileCopyrightText: Antoni Andre SPDX-FileCopyrightText: Anthony Fu SPDX-FileCopyrightText: Andris Reinman SPDX-FileCopyrightText: Andrea Giammarchi -SPDX-FileCopyrightText: Alexander Piskun SPDX-FileCopyrightText: @nextcloud/dialogs developers @@ -434,6 +432,6 @@ This file is generated from multiple sources. Included packages: - zwitch - version: 2.0.4 - license: MIT -- app_api +- nextcloud - version: 1.0.0 - - license: ( AGPL-3.0-or-later) + - license: AGPL-3.0-or-later diff --git a/js/app_api-filesplugin.js.license b/js/app_api-filesplugin.js.license index 6fee605a..b4b5c681 100644 --- a/js/app_api-filesplugin.js.license +++ b/js/app_api-filesplugin.js.license @@ -2,13 +2,14 @@ SPDX-License-Identifier: MIT SPDX-License-Identifier: ISC SPDX-License-Identifier: GPL-3.0-or-later SPDX-License-Identifier: BSD-3-Clause +SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: (MPL-2.0 OR Apache-2.0) -SPDX-License-Identifier: ( AGPL-3.0-or-later) SPDX-FileCopyrightText: escape-html developers SPDX-FileCopyrightText: Tobias Koppers @sokra SPDX-FileCopyrightText: T. Jameson Little SPDX-FileCopyrightText: Roman Shtylman SPDX-FileCopyrightText: Roeland Jago Douma +SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors SPDX-FileCopyrightText: Matt Zabriskie SPDX-FileCopyrightText: James Halliday SPDX-FileCopyrightText: GitHub Inc. @@ -16,7 +17,6 @@ SPDX-FileCopyrightText: Feross Aboukhadijeh SPDX-FileCopyrightText: Dr.-Ing. Mario Heiderich, Cure53 (https://cure53.de/) SPDX-FileCopyrightText: Christoph Wurst SPDX-FileCopyrightText: Alkemics -SPDX-FileCopyrightText: Alexander Piskun This file is generated from multiple sources. Included packages: @@ -65,6 +65,6 @@ This file is generated from multiple sources. Included packages: - webpack - version: 5.94.0 - license: MIT -- app_api +- nextcloud - version: 1.0.0 - - license: ( AGPL-3.0-or-later) + - license: AGPL-3.0-or-later