Skip to content

Commit 25cccde

Browse files
committed
deleted compliance unit test and updated license compliance
1 parent 7f8aac2 commit 25cccde

File tree

2 files changed

+14
-58
lines changed

2 files changed

+14
-58
lines changed

.github/workflows/license-compliance.yml

+14-1
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,23 @@ jobs:
4040
echo "::set-output name=dependency-licenses::${dependency_licenses}"
4141
4242
- name: 'Compare Dependency licenses'
43+
id: compare-dependency-licenses
4344
run: |
4445
dependency_licenses=${{ steps.parse-dependency-licenses.outputs.dependency-licenses }}
4546
permitted_licenses="MIT,Apache-2.0,BSD,EPL1"
47+
non_compliant_packages=""
4648
for package in $(echo "${dependency_licenses}" | jq -r '.[] | .Package')
4749
do
4850
license=$(echo "${dependency_licenses}" | jq -r --arg package "$package" '.[] | select(.Package == $package) | .License')
4951
if [[ ! ",${permitted_licenses}," =~ ",${license}," ]]; then
5052
echo "Error: Package $package has an unrecognized license: $license"
51-
exit 1
53+
non_compliant_packages+="Package $package has an unrecognized license: $license\n"
5254
fi
5355
done
56+
echo "::set-output name=non-compliant-packages::${non_compliant_packages}"
57+
if [ -n "${non_compliant_packages}" ]; then
58+
exit 1
59+
fi
5460
5561
- name: 'Upload Dependency License Report'
5662
if: always()
@@ -59,5 +65,12 @@ jobs:
5965
name: dependency-license-report
6066
path: dependency_licenses.json
6167

68+
- name: 'Upload License Compliance Results'
69+
if: always()
70+
uses: actions/upload-artifact@v2
71+
with:
72+
name: license-compliance-results
73+
path: license_compliance_results.txt
74+
6275
- name: License compliance summary
6376
run: echo "License compliance check completed. See artifacts for details."

src/test/test_license_compliance.py

-57
This file was deleted.

0 commit comments

Comments
 (0)