From f38869abb9220afe1e17d1dccd3637148e8f3ecc Mon Sep 17 00:00:00 2001 From: woocheol Date: Mon, 6 Jul 2026 11:28:07 +0900 Subject: [PATCH] chore(reuse): migrate to REUSE.toml and update GitHub Actions Signed-off-by: woocheol --- .github/PULL_REQUEST_TEMPLATE.md | 4 -- .github/workflows/publish-release.yml | 8 +-- .github/workflows/pull-request.yml | 8 +-- .github/workflows/release-drafter-config.yml | 2 +- .reuse/dep5 | 47 ---------------- REUSE.toml | 59 ++++++++++++++++++++ 6 files changed, 68 insertions(+), 60 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a327490..e69de29 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +0,0 @@ -## Description - \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index c1cca50..baa9a7a 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -11,7 +11,7 @@ jobs: update-changelog: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: fetch-depth: 0 - name: Get Release @@ -45,7 +45,7 @@ jobs: git add CHANGELOG.md pyproject.toml git commit -m "Update ChangeLog" - name: Push changes - uses: ad-m/github-push-action@master + uses: ad-m/github-push-action@v1.3.0 with: github_token: ${{ secrets.TOKEN }} branch: main @@ -54,11 +54,11 @@ jobs: runs-on: ubuntu-latest needs: update-changelog steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: ref: main - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v6 with: python-version: '3.11' - name: Install dependencies diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0868d86..58bcf4c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -18,9 +18,9 @@ jobs: matrix: python-version: [3.11, 3.14] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v7 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -34,6 +34,6 @@ jobs: reuse: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v7 - name: REUSE Compliance Check - uses: fsfe/reuse-action@v1 + uses: fsfe/reuse-action@v6 diff --git a/.github/workflows/release-drafter-config.yml b/.github/workflows/release-drafter-config.yml index d5430cd..5334b15 100644 --- a/.github/workflows/release-drafter-config.yml +++ b/.github/workflows/release-drafter-config.yml @@ -7,7 +7,7 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v7 with: config-name: release-drafter-config.yml env: diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index 7fc31eb..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,47 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: FOSSLight Android -Source: https://github.com/fosslight/fosslight_android_scanner - -Files: pyproject.toml -Copyright: 2023 LG Electronics Inc. -License: Apache-2.0 - -Files: *.md -Copyright: 2023 LG Electronics -License: Apache-2.0 - -Files: test/* -Copyright: 2023 LG Electronics -License: Apache-2.0 - -Files: .github/* -Copyright: 2023 LG Electronics -License: Apache-2.0 - -Files: MANIFEST.in -Copyright: 2023 LG Electronics -License: Apache-2.0 - -Files: requirements*.txt -Copyright: 2023 LG Electronics -License: Apache-2.0 - -Files: .gitignore -Copyright: 2023 LG Electronics -License: Apache-2.0 - -Files: src/fosslight_android/resources/* -Copyright: 2023 LG Electronics -License: Apache-2.0 - -Files: script/generate-notice-files.py -Copyright: 2012 The Android Open Source Project -License: Apache-2.0 - -Files: tox.ini -Copyright: 2023 LG Electronics -License: Apache-2.0 - -Files: .coderabbit.yaml -Copyright: 2026 LG Electronics -License: Apache-2.0 diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..0037313 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,59 @@ +version = 1 +SPDX-PackageName = "FOSSLight Android" +SPDX-PackageDownloadLocation = "https://github.com/fosslight/fosslight_android_scanner" + +[[annotations]] +path = "pyproject.toml" +SPDX-FileCopyrightText = "2023 LG Electronics Inc." +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "**.md" +SPDX-FileCopyrightText = "2023 LG Electronics" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "test/**" +precedence = "override" +SPDX-FileCopyrightText = "2023 LG Electronics" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = ".github/**" +SPDX-FileCopyrightText = "2023 LG Electronics" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "MANIFEST.in" +SPDX-FileCopyrightText = "2023 LG Electronics" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "requirements**.txt" +SPDX-FileCopyrightText = "2023 LG Electronics" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = ".gitignore" +SPDX-FileCopyrightText = "2023 LG Electronics" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "src/fosslight_android/resources/**" +SPDX-FileCopyrightText = "2023 LG Electronics" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "script/generate-notice-files.py" +SPDX-FileCopyrightText = "2012 The Android Open Source Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "tox.ini" +SPDX-FileCopyrightText = "2023 LG Electronics" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = ".coderabbit.yaml" +SPDX-FileCopyrightText = "2026 LG Electronics" +SPDX-License-Identifier = "Apache-2.0"