From 96bfcefc5b8c3a0ff9798187ec3db6f16f8122e7 Mon Sep 17 00:00:00 2001 From: Marc Bernard Date: Thu, 11 Dec 2025 09:27:47 -0500 Subject: [PATCH 1/3] chore: update template files --- .gitattributes | 20 +++++++++++++++++ .reuse/dep5 | 60 -------------------------------------------------- REUSE.toml | 6 +++++ 3 files changed, 26 insertions(+), 60 deletions(-) create mode 100755 .gitattributes delete mode 100644 .reuse/dep5 create mode 100755 REUSE.toml diff --git a/.gitattributes b/.gitattributes new file mode 100755 index 0000000..c435c7a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,20 @@ +# newlines +* text=auto eol=lf + +*.xml text eol=lf +*.abap text eol=lf +*.md text eol=lf +*.txt text eol=lf +*.yml text eol=lf +*.yaml text eol=lf +*.js text eol=lf +*.json text eol=lf +*.html text eol=lf +*.css text eol=lf +*.svg text eol=lf +*.sh text eol=lf + +*.jpg binary +*.gif binary +*.png binary +*.jpeg binary diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index c0b6443..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,60 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Marc Bernard Tools - Base -Upstream-Contact: Marc Bernard -Source: https://github.com/Marc-Bernard-Tools/MBT-Base - -Files: * -Copyright: 2021 Marc Bernard -License: GPL-3.0-only - -Files: src/fonts/*font_awesome* -Copyright: 2021 Font Awesome -License: OFL-1.1-RFN - -Files: src/fonts/*font_awesome_css* -Copyright: 2021 Font Awesome -License: CC0-1.0 - -Files: src/fonts/*font_righteous* -Copyright: 2011 by Brian J. Bonislawsky DBA Astigmatic (AOETI) -License: OFL-1.1-RFN - -Files: src/fonts/*font_open_sans* -Copyright: 2020 The Open Sans Project Authors -License: OFL-1.1 - -Files: src/http/* -Copyright: 2014 abapGit Contributors -License: MIT - -Files: src/inst/* -Copyright: 2014 abapGit Contributors -License: MIT - -Files: src/ui/* -Copyright: 2014 abapGit Contributors -License: MIT - -Files: src/utils/* -Copyright: 2014 abapGit Contributors -License: MIT - -Files: src/json/* scripts/*ajson* -Copyright: 2020 Alexander Tsybulsky -License: MIT - -Files: src/stringmap/* scripts/*stringmap* -Copyright: 2020 Alexander Tsybulsky -License: MIT - -Files: src/log/* scripts/*logger* -Copyright: 2017 Eric Peterson -License: MIT - -Files: src/reg/* -Copyright: 2015 Martin Ceronio -License: MIT - -Files: installer/* -Copyright: 2014 abapGit Contributors -License: MIT diff --git a/REUSE.toml b/REUSE.toml new file mode 100755 index 0000000..8710d34 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,6 @@ +version = 1 + +[[annotations]] +path = "**/*" +SPDX-FileCopyrightText = "2023 Marc Bernard " +SPDX-License-Identifier = "GPL-3.0-only" From f9ecb126bcb330dda7f563464a21c1502518f5ce Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 11 Dec 2025 10:21:58 -0500 Subject: [PATCH 2/3] Add copyright and license annotations to REUSE.toml --- REUSE.toml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/REUSE.toml b/REUSE.toml index 8710d34..5c41e78 100755 --- a/REUSE.toml +++ b/REUSE.toml @@ -4,3 +4,68 @@ version = 1 path = "**/*" SPDX-FileCopyrightText = "2023 Marc Bernard " SPDX-License-Identifier = "GPL-3.0-only" + +[[annotations]] +path = "src/fonts/*font_awesome*" +SPDX-FileCopyrightText = "2021 Font Awesome " +SPDX-License-Identifier = "OFL-1.1-RFN" + +[[annotations]] +path = "src/fonts/*font_awesome_css*" +SPDX-FileCopyrightText = "2021 Font Awesome " +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = "src/fonts/*font_righteous*" +SPDX-FileCopyrightText = "2011 by Brian J. Bonislawsky DBA Astigmatic (AOETI) " +SPDX-License-Identifier = "OFL-1.1-RFN" + +[[annotations]] +path = "src/fonts/*font_open_sans*" +SPDX-FileCopyrightText = "2020 The Open Sans Project Authors " +SPDX-License-Identifier = "OFL-1.1" + +[[annotations]] +path = "src/http/*" +SPDX-FileCopyrightText = "2014 abapGit Contributors " +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "src/inst/*" +SPDX-FileCopyrightText = "2014 abapGit Contributors " +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "src/ui/*" +SPDX-FileCopyrightText = "2014 abapGit Contributors " +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "src/utils/*" +SPDX-FileCopyrightText = "2014 abapGit Contributors " +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = ["src/json/*", "scripts/*ajson*"] +SPDX-FileCopyrightText = "2020 Alexander Tsybulsky " +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = ["src/stringmap/*", "scripts/*stringmap*"] +SPDX-FileCopyrightText = "2020 Alexander Tsybulsky " +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = ["src/log/*", "scripts/*logger*"] +SPDX-FileCopyrightText = "2017 Eric Peterson " +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "src/reg/*" +SPDX-FileCopyrightText = "2015 Martin Ceronio " +SPDX-License-Identifier = "MIT" + +[[annotations]] +path = "installer/*" +SPDX-FileCopyrightText = "2014 abapGit Contributors " +SPDX-License-Identifier = "MIT" From 5f7539cf0d43038d26472f2146e63b1f59d18587 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 11 Dec 2025 10:24:52 -0500 Subject: [PATCH 3/3] Update REUSE workflow for compliance checks --- .github/workflows/reuse.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index 2e31c72..7bc1392 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -1,11 +1,20 @@ +# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. +# +# SPDX-License-Identifier: CC0-1.0 + name: REUSE Compliance Check -on: [pull_request,workflow_dispatch] +on: [push, pull_request, workflow_dispatch] + +permissions: + contents: read jobs: - test: + Reuse-Compliance-Check: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: REUSE Compliance Check - uses: fsfe/reuse-action@v1 + uses: fsfe/reuse-action@694eabb15673ec601ea19d4cd949969141372512 # v5.0.0