Merge pull request #127 from martinling/fix-license-ci

Fix failures in license scripts being lost
greatscottgadgets · Jul 13, 2024 · 1c4d9c2 · 1c4d9c2
2 parents 50d0f41 + cea0234
commit 1c4d9c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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

diff --git 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',
@@ -120,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)