From afb61b57489353668d9beaa5492975aceb588ff7 Mon Sep 17 00:00:00 2001 From: Kiko Fernandez-Reyes Date: Thu, 21 Nov 2024 15:33:30 +0100 Subject: [PATCH] license: curate incorrect license --- .github/workflows/license-scanner.yaml | 3 ++- scripts/scan-code.escript | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/license-scanner.yaml b/.github/workflows/license-scanner.yaml index 0c49c683e7ba..2a02d70821e6 100644 --- a/.github/workflows/license-scanner.yaml +++ b/.github/workflows/license-scanner.yaml @@ -55,6 +55,7 @@ jobs: - name: License Compliance Check run: | pip install scancode-toolkit==32.3.0 + scancode-reindex-licenses --additional-directory scripts/licensedetection/ scripts/scan-code.escript --file-or-dir "${{ steps.new-files.outputs.new_files }}" \ --sarif results.sarif @@ -86,4 +87,4 @@ jobs: if: ${{ !cancelled() }} uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # ratchet:github/codeql-action/upload-sarif@v3 with: - sarif_file: "SARIF file/results.sarif" \ No newline at end of file + sarif_file: "SARIF file/results.sarif" diff --git a/scripts/scan-code.escript b/scripts/scan-code.escript index c29fad8734a1..c33770597ead 100755 --- a/scripts/scan-code.escript +++ b/scripts/scan-code.escript @@ -47,7 +47,7 @@ reviewed() -> <<"autoconf-simple-exception">>, <<"unicode">>, <<"tcl">>, <<"gpl-2.0 WITH classpath-exception-2.0">>, <<"zlib">>, <<"lgpl-2.0-plus WITH wxwindows-exception-3.1">>, <<"openssl-ssleay">>, <<"cc-by-sa-3.0">>, <<"cc-by-4.0">>, <<"dco-1.1">>, <<"fsf-ap">>, - <<"classpath-exception-2.0">>, <<"ietf-trust">> ]. + <<"classpath-exception-2.0">>, <<"ietf-trust">>, <<"apache-2.0-or-lgpl-2.1-or-later">> ]. not_approved() -> [<<"gpl">>, <<"gpl-3.0-plus">>, <<"gpl-2.0">>, <<"gpl-1.0-plus">>, <<"unlicense">>,