From 492fe94cee07a576fbf4a94e27dd28fb6650586c Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Sat, 13 Jul 2024 16:13:03 +0100 Subject: [PATCH 1/3] Use bash as shell for multi-command action. --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index dd0dba45..1a4a5dd1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -117,6 +117,8 @@ jobs: if: matrix.os == 'windows-latest' - name: Gather licenses (Windows) + # If the default shell is used, one command failing does not fail the action. + shell: bash run: | pip install license-expression python wix/rust_licenses.py > wix/LICENSE-static-libraries.txt From dd8061ed577db7f5414e338072a360e0f7ace5ae Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Sat, 13 Jul 2024 16:24:03 +0100 Subject: [PATCH 2/3] Add BSD-2-Clause to accepted licenses. --- wix/rust_licenses.py | 1 + 1 file changed, 1 insertion(+) diff --git a/wix/rust_licenses.py b/wix/rust_licenses.py index cfde1263..e8a4ebab 100644 --- a/wix/rust_licenses.py +++ b/wix/rust_licenses.py @@ -9,6 +9,7 @@ # We accept these licenses unconditionally. accepted_license_strings = ( 'MIT', + 'BSD-2-Clause', 'BSD-3-Clause', 'BSL-1.0', 'Unicode-DFS-2016', From cea0234f63d4d90378dff4bee1032bf451d35691 Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Sat, 13 Jul 2024 16:34:01 +0100 Subject: [PATCH 3/3] Add COPYING to the list of filenames to check for a license. --- wix/rust_licenses.py | 1 + 1 file changed, 1 insertion(+) diff --git a/wix/rust_licenses.py b/wix/rust_licenses.py index e8a4ebab..ed69c16b 100644 --- a/wix/rust_licenses.py +++ b/wix/rust_licenses.py @@ -121,6 +121,7 @@ def validate_license(package, version, expr): 'license-mit', 'LICENSE', 'LICENSE.md', + 'COPYING', ) src_dir = os.path.join(deps.name, f'{package}-{version}') src_files = os.listdir(src_dir)