From 0be559c3a9e79d36a67a69a581ce8446e47ee91c Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 17 Jul 2024 14:50:25 +0200 Subject: [PATCH 1/2] chore: Migrate REUSE to TOML format Signed-off-by: Andy Scherzinger --- .github/workflows/reuse.yml | 8 +++++--- .reuse/dep5 | 8 -------- REUSE.toml | 12 ++++++++++++ 3 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index ac77cbf..95eaba8 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -9,12 +9,14 @@ name: REUSE Compliance Check -on: pull_request +on: [pull_request] jobs: reuse-compliance-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - name: Checkout + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: REUSE Compliance Check - uses: fsfe/reuse-action@a46482ca367aef4454a87620aa37c2be4b2f8106 # v3.0.0 + uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4.0.0 diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index 338b49d..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,8 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: nextcloud-prettier-config -Upstream-Contact: Ferdinand Thiessen -Source: https://github.com/nextcloud-libraries/nextcloud-prettier-config - -Files: package-lock.json package.json -Copyright: Nextcloud contributors -License: MIT diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..abcae32 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,12 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud contributors +# SPDX-License-Identifier: MIT +version = 1 +SPDX-PackageName = "nextcloud-prettier-config" +SPDX-PackageSupplier = "Ferdinand Thiessen " +SPDX-PackageDownloadLocation = "https://github.com/nextcloud-libraries/nextcloud-prettier-config" + +[[annotations]] +path = ["package-lock.json", "package.json"] +precedence = "aggregate" +SPDX-FileCopyrightText = "Nextcloud contributors" +SPDX-License-Identifier = "MIT" From 03153e5c338b3ff590d8599dfb8e5431e2d494be Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 17 Jul 2024 14:51:07 +0200 Subject: [PATCH 2/2] docs: Add REUSE status badge Signed-off-by: Andy Scherzinger --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index cede6a2..e5adf8c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Nextcloud Prettier configuration +[![REUSE status](https://api.reuse.software/badge/github.com/nextcloud-libraries/nextcloud-prettier-config)](https://api.reuse.software/info/github.com/nextcloud-libraries/nextcloud-prettier-config) + This provides a shared configuration for Nextcloud apps and libraries to have consistent stylistic rules. Using stylistic rules in linters is not recommended as linters are for finding bugs while prettier is for code style. Moreover ESLint and StyleLint both deprecate and remove stylistic rules, as a replacement using Prettier is recommended.