From 25fa7ca6d90f4b2790338c85f911d3c64e0d505c Mon Sep 17 00:00:00 2001 From: Matthias Mayr Date: Fri, 19 Jan 2024 16:23:00 +0000 Subject: [PATCH 1/2] New: Passes ros_license_toolkit check - SPDX-compliant license in package.xml - Replace LPGL string in changelog with SPDX license - Remove preambel License.md file --- LICENSE.md | 8 -------- skiros2/CHANGELOG.rst | 2 +- skiros2/package.xml | 2 +- skiros2_common/package.xml | 2 +- skiros2_gui/CHANGELOG.rst | 2 +- skiros2_gui/package.xml | 2 +- skiros2_msgs/CHANGELOG.rst | 2 +- skiros2_msgs/package.xml | 2 +- skiros2_skill/package.xml | 2 +- skiros2_task/package.xml | 2 +- skiros2_world_model/package.xml | 2 +- 11 files changed, 10 insertions(+), 18 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 500686e..185e702 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,11 +1,3 @@ -SkiROS2 - Skill-based platform for ROS v2 - -Software License Agreement (L-GPL License) - -Copyright (C) 2018 RiACT ApS - -Authors: Francesco Rovida, Bjarne Grossmann - This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or diff --git a/skiros2/CHANGELOG.rst b/skiros2/CHANGELOG.rst index 5bf024f..49e8e6d 100644 --- a/skiros2/CHANGELOG.rst +++ b/skiros2/CHANGELOG.rst @@ -72,7 +72,7 @@ Changelog for package skiros2 * Finish plan-in-the-tree * Added extra properties to test robot hardware * Changed test camera type -* Changed license to L-GPL and updated changelog +* Changed license to LGPL-3.0-or-later and updated changelog * Updated version and changelog file * Contributors: Matthias Mayr, RvmiLab, Francesco Rovida diff --git a/skiros2/package.xml b/skiros2/package.xml index 41c6c35..b405fcd 100644 --- a/skiros2/package.xml +++ b/skiros2/package.xml @@ -8,7 +8,7 @@ Francesco Rovida Bjarne Grossmann - L-GPL + LGPL-3.0-or-later Francesco Rovida Francesco Rovida diff --git a/skiros2_common/package.xml b/skiros2_common/package.xml index f4807e9..ddedee0 100644 --- a/skiros2_common/package.xml +++ b/skiros2_common/package.xml @@ -6,7 +6,7 @@ Francesco Rovida Bjarne Grossmann - L-GPL + LGPL-3.0-or-later Francesco Rovida Francesco Rovida diff --git a/skiros2_gui/CHANGELOG.rst b/skiros2_gui/CHANGELOG.rst index 47eb72a..03be9e4 100644 --- a/skiros2_gui/CHANGELOG.rst +++ b/skiros2_gui/CHANGELOG.rst @@ -86,7 +86,7 @@ Changelog for package skiros2_gui * Added timeout to kill blocked BTs. Minor improvements on GUI * GUI improvements: BT execution visualization and more intuitive interface * Implemented visualization of active tasks -* Changed license to L-GPL and updated changelog +* Changed license to LGPL-3.0-or-later and updated changelog * Updated version and changelog file * Contributors: Francesco Rovida, Matthias Mayr, Francesco Rovida diff --git a/skiros2_gui/package.xml b/skiros2_gui/package.xml index fad522c..478153f 100644 --- a/skiros2_gui/package.xml +++ b/skiros2_gui/package.xml @@ -6,7 +6,7 @@ Francesco Rovida Bjarne Grossmann - L-GPL + LGPL-3.0-or-later Francesco Rovida Francesco Rovida diff --git a/skiros2_msgs/CHANGELOG.rst b/skiros2_msgs/CHANGELOG.rst index 73b161d..85b214c 100644 --- a/skiros2_msgs/CHANGELOG.rst +++ b/skiros2_msgs/CHANGELOG.rst @@ -37,7 +37,7 @@ Changelog for package skiros2_msgs * Merged 'develop' into 'pycodestyle'. * Finish plan-in-the-tree * GUI improvements: BT execution visualization and more intuitive interface -* Changed license to L-GPL and updated changelog +* Changed license to LGPL-3.0-or-later and updated changelog * Updated version and changelog file * Contributors: Matthias Mayr, Francesco Rovida diff --git a/skiros2_msgs/package.xml b/skiros2_msgs/package.xml index 16c140b..dd31ede 100644 --- a/skiros2_msgs/package.xml +++ b/skiros2_msgs/package.xml @@ -7,7 +7,7 @@ Francesco Rovida Bjarne Grossmann - L-GPL + LGPL-3.0-or-later Francesco Rovida Francesco Rovida diff --git a/skiros2_skill/package.xml b/skiros2_skill/package.xml index 5b2b337..6ebfc78 100644 --- a/skiros2_skill/package.xml +++ b/skiros2_skill/package.xml @@ -6,7 +6,7 @@ Francesco Rovida Bjarne Grossmann - L-GPL + LGPL-3.0-or-later Francesco Rovida Francesco Rovida diff --git a/skiros2_task/package.xml b/skiros2_task/package.xml index c2c94fb..3b6479b 100644 --- a/skiros2_task/package.xml +++ b/skiros2_task/package.xml @@ -6,7 +6,7 @@ Francesco Rovida Bjarne Grossmann - L-GPL + LGPL-3.0-or-later Francesco Rovida Francesco Rovida diff --git a/skiros2_world_model/package.xml b/skiros2_world_model/package.xml index c7c51c6..4a10dd1 100644 --- a/skiros2_world_model/package.xml +++ b/skiros2_world_model/package.xml @@ -6,7 +6,7 @@ Francesco Rovida Bjarne Grossmann - L-GPL + LGPL-3.0-or-later Francesco Rovida Francesco Rovida From 5779a87a431f92c76da865caf69323a6cfdda13f Mon Sep 17 00:00:00 2001 From: Matthias Mayr Date: Fri, 19 Jan 2024 16:23:24 +0000 Subject: [PATCH 2/2] New: License check workflow --- .github/workflows/ros-license-check.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/ros-license-check.yml diff --git a/.github/workflows/ros-license-check.yml b/.github/workflows/ros-license-check.yml new file mode 100644 index 0000000..ee049af --- /dev/null +++ b/.github/workflows/ros-license-check.yml @@ -0,0 +1,15 @@ +name: Check Licenses + +on: + push: + branches: [ "master", "pr_license"] + pull_request: + branches: [ "master"] + +jobs: + check_licenses: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - uses: matthias-mayr/ros_license_toolkit@1.2.3 \ No newline at end of file