Skip to content

Commit 0ec685c

Browse files
committed
Update license-compliance.yml
1 parent 734c866 commit 0ec685c

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

.github/workflows/license-compliance.yml

+8-12
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,17 @@ jobs:
4646
echo "Dependency licenses content:"
4747
echo "${dependency_licenses}"
4848
49-
permitted_licenses="MIT,Apache-2.0,BSD,EPL1"
50-
non_compliant_packages=""
51-
for package in $(echo "${dependency_licenses}" | jq -r '.[] | .Package')
52-
do
53-
license=$(echo "${dependency_licenses}" | jq -r --arg package "$package" '.[] | select(.Package == $package) | .License')
49+
permitted_licenses="MIT License,Apache-2.0,BSD,EPL1" # Updated permitted licenses list
50+
51+
for package_info in $(echo "${dependency_licenses}" | jq -c '.[]'); do
52+
package_name=$(echo "${package_info}" | jq -r '.Name')
53+
license=$(echo "${package_info}" | jq -r '.License')
54+
5455
if [[ ! ",${permitted_licenses}," =~ ",${license}," ]]; then
55-
echo "Error: Package $package has an unrecognized license: $license"
56-
non_compliant_packages+="Package $package has an unrecognized license: $license\n"
56+
echo "Error: Package ${package_name} has an unrecognized license: ${license}"
57+
exit 1
5758
fi
5859
done
59-
echo "::set-output name=non-compliant-packages::${non_compliant_packages}"
60-
if [ -n "${non_compliant_packages}" ]; then
61-
exit 1
62-
fi
63-
6460
6561
- name: 'Upload Dependency License Report'
6662
if: always()

0 commit comments

Comments
 (0)