From ca22404af920a89c63274688074f0f130dec3ef9 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 17 Jul 2024 14:43:03 +0200 Subject: [PATCH] chore: Migrate REUSE to TOML format Signed-off-by: Andy Scherzinger --- .github/workflows/reuse.yml | 19 +++++++++++++------ .reuse/dep5 | 16 ---------------- REUSE.toml | 24 ++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 22 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index bdea26a..95eaba8 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -1,15 +1,22 @@ +# This workflow is provided via the organization template repository +# +# https://github.com/nextcloud/.github +# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization + # SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. -# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# # SPDX-License-Identifier: CC0-1.0 name: REUSE Compliance Check -on: [push, pull_request] +on: [pull_request] jobs: - reuse: + reuse-compliance-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: REUSE Compliance Check - uses: fsfe/reuse-action@v3 + - name: Checkout + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + + - name: REUSE Compliance Check + uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4.0.0 diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index 9095961..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,16 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: @nextcloud/timezones -Upstream-Contact: Richard Steinmetz -Source: https://github.com/nextcloud-libraries/timezones - -Files: package.json package-lock.json README.md CHANGELOG.md -Copyright: 2024 Nextcloud GmbH and Nextcloud contributors -License: AGPL-3.0-or-later - -Files: resources/timezones/zones.json -Copyright: 2021-2024 Nextcloud GmbH and Nextcloud contributors -License: AGPL-3.0-or-later - -Files: tests/assets/*.ics -Copyright: 2019-2024 Nextcloud GmbH and Nextcloud contributors -License: AGPL-3.0-or-later diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..e7a5019 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,24 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: AGPL-3.0-or-later +version = 1 +SPDX-PackageName = "@nextcloud/timezones" +SPDX-PackageSupplier = "Richard Steinmetz " +SPDX-PackageDownloadLocation = "https://github.com/nextcloud-libraries/timezones" + +[[annotations]] +path = ["package.json", "package-lock.json", "README.md", "CHANGELOG.md"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2024 Nextcloud GmbH and Nextcloud contributors" +SPDX-License-Identifier = "AGPL-3.0-or-later" + +[[annotations]] +path = "resources/timezones/zones.json" +precedence = "aggregate" +SPDX-FileCopyrightText = "2021-2024 Nextcloud GmbH and Nextcloud contributors" +SPDX-License-Identifier = "AGPL-3.0-or-later" + +[[annotations]] +path = "tests/assets/**.ics" +precedence = "aggregate" +SPDX-FileCopyrightText = "2019-2024 Nextcloud GmbH and Nextcloud contributors" +SPDX-License-Identifier = "AGPL-3.0-or-later"