Skip to content

Commit e45a1f2

Browse files
authored
Improve SBoM Details (#14258)
1 parent 9805005 commit e45a1f2

File tree

5 files changed

+121
-12
lines changed

5 files changed

+121
-12
lines changed

.github/workflows/ort/action.yml

-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
name: "Run OSS Review Toolkit"
55
description: "Runs OSS Review Toolkit & generates SBoMs"
66
inputs:
7-
build-artifacts:
8-
description: |
9-
Build Artifact paths to include into SBoM.
10-
May contain a glob pattern or list of paths separated by a newline.
11-
required: false
12-
default: ""
137
report-formats:
148
description: "ORT Report Formats"
159
required: true

.github/workflows/release.yml

-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ jobs:
196196
id: ort
197197
uses: ./.github/workflows/ort
198198
with:
199-
build-artifacts: "/tmp/build-artifacts/*"
200199
report-formats: "CycloneDx,SpdxDocument"
201200
version: "${{ github.ref_type == 'tag' && github.ref_name || github.sha }}"
202201

.ort.yml

+92-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,111 @@
11
# SPDX-License-Identifier: Apache-2.0
22
# SPDX-FileCopyrightText: 2021 The Elixir Team
33

4+
excludes:
5+
paths:
6+
- pattern: "lib/elixir/pages/**/*"
7+
reason: "DOCUMENTATION_OF"
8+
comment: "Documentation"
9+
- pattern: "lib/elixir/scripts/**/*"
10+
reason: "BUILD_TOOL_OF"
11+
comment: "Build Tool"
12+
- pattern: "lib/ex_unit/examples/**/*"
13+
reason: "EXAMPLE_OF"
14+
comment: "Example"
15+
- pattern: "lib/*/test/**/*"
16+
reason: "TEST_OF"
17+
comment: "Tests"
18+
- pattern: "man/*"
19+
reason: "DOCUMENTATION_OF"
20+
comment: "Documentation"
21+
- pattern: ".github/*"
22+
reason: "BUILD_TOOL_OF"
23+
comment: "Documentation"
24+
- pattern: ".ort/*"
25+
reason: "BUILD_TOOL_OF"
26+
comment: "Documentation"
27+
428
curations:
529
license_findings:
30+
# Logos
631
- path: "lib/elixir/pages/images/logo.png"
7-
reason: "INCORRECT"
32+
reason: "NOT_DETECTED"
33+
comment: "Apply Trademark Policy to Elixir Logo"
34+
detected_license: "NONE"
35+
concluded_license: "LicenseRef-elixir-trademark-policy"
36+
- path: "lib/elixir/scripts/windows_installer/assets/Elixir.ico"
37+
reason: "NOT_DETECTED"
838
comment: "Apply Trademark Policy to Elixir Logo"
939
detected_license: "NONE"
1040
concluded_license: "LicenseRef-elixir-trademark-policy"
1141

42+
# Version File
43+
- path: "VERSION"
44+
reason: "NOT_DETECTED"
45+
comment: "Apply Trademark Policy to VERSION file"
46+
detected_license: "NONE"
47+
concluded_license: "Apache-2.0"
48+
49+
# Documentation Images
50+
- path: "lib/elixir/pages/images/**/*.png"
51+
reason: "NOT_DETECTED"
52+
comment: "Apply default license to all images"
53+
detected_license: "NONE"
54+
concluded_license: "Apache-2.0"
55+
56+
# Test Fixtures
57+
- path: "lib/eex/test/fixtures/**/*"
58+
reason: "NOT_DETECTED"
59+
comment: "Apply default license to test fixtures"
60+
detected_license: "NONE"
61+
concluded_license: "Apache-2.0"
62+
- path: "lib/elixir/test/elixir/fixtures/**/*"
63+
reason: "NOT_DETECTED"
64+
comment: "Apply default license to test fixtures"
65+
detected_license: "NONE"
66+
concluded_license: "Apache-2.0"
67+
- path: "lib/ex_unit/test/fixtures/**/*"
68+
reason: "NOT_DETECTED"
69+
comment: "Apply default license to test fixtures"
70+
detected_license: "NONE"
71+
concluded_license: "Apache-2.0"
72+
- path: "lib/mix/test/fixtures/**/*"
73+
reason: "NOT_DETECTED"
74+
comment: "Apply default license to test fixtures"
75+
detected_license: "NONE"
76+
concluded_license: "Apache-2.0"
77+
78+
# Unicode
79+
- path: "lib/elixir/unicode/*.txt"
80+
reason: "NOT_DETECTED"
81+
comment: "Apply default license to unicode files"
82+
detected_license: "NONE"
83+
concluded_license: "LicenseRef-scancode-unicode"
84+
85+
# Wrongly Identified
86+
- path: "LICENSES/LicenseRef-elixir-trademark-policy.txt"
87+
reason: "INCORRECT"
88+
comment: "Correct LicenseRef"
89+
detected_license: "LicenseRef-scancode-proprietary-license"
90+
concluded_license: "LicenseRef-elixir-trademark-policy"
1291
- path: "lib/elixir/pages/references/library-guidelines.md"
1392
reason: "INCORRECT"
1493
comment: |
1594
The guide mentions multiple licenses for users to choose from.
1695
It however is not licensed itself by the mentioned licenses.
1796
concluded_license: "Apache-2.0"
18-
19-
- path: "**/*"
97+
- path: ".gitignore"
98+
reason: "INCORRECT"
99+
comment: "Ignored by ScanCode"
100+
detected_license: "NONE"
101+
concluded_license: "Apache-2.0"
102+
- path: ".gitattributes"
103+
reason: "INCORRECT"
104+
comment: "Ignored by ScanCode"
105+
detected_license: "NONE"
106+
concluded_license: "Apache-2.0"
107+
- path: "lib/elixir/scripts/windows_installer/.gitignore"
20108
reason: "INCORRECT"
21-
comment: "Apply default license to all unknown files"
109+
comment: "Ignored by ScanCode"
22110
detected_license: "NONE"
23111
concluded_license: "Apache-2.0"

.ort/config/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ ort:
88

99
analyzer:
1010
allowDynamicVersions: true
11-
enabledPackageManagers: [Unmanaged]
11+
enabledPackageManagers: [SpdxDocumentFile]
1212
skipExcluded: true

project.spdx.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
SPDXID: "SPDXRef-DOCUMENT"
2+
spdxVersion: "SPDX-2.2"
3+
creationInfo:
4+
created: "2025-02-05T12:29:35Z"
5+
creators:
6+
- "Organization: The Elixir Team"
7+
licenseListVersion: "3.9"
8+
name: "elixir"
9+
dataLicense: "CC0-1.0"
10+
documentNamespace: "https://github.com/elixir-lang/elixir"
11+
documentDescribes:
12+
- "SPDXRef-Package-elixir"
13+
packages:
14+
- SPDXID: "SPDXRef-Package-elixir"
15+
summary: "About Elixir is a dynamic, functional language for building scalable and maintainable applications"
16+
copyrightText: "Copyright (c) 2012 Plataformatec. Copyright (c) 2021 The Elixir Team. All Rights Reserved."
17+
downloadLocation: "git+https://github.com/elixir-lang/elixir.git"
18+
filesAnalyzed: false
19+
homepage: "https://elixir-lang.org/"
20+
licenseConcluded: "Apache-2.0 AND LicenseRef-scancode-unicode"
21+
licenseDeclared: "Apache-2.0 AND LicenseRef-scancode-unicode"
22+
name: "elixir"
23+
packageFileName: "./"
24+
externalRefs:
25+
- referenceCategory: PACKAGE-MANAGER
26+
referenceType: "purl"
27+
referenceLocator: "pkg:github/elixir-lang/elixir"
28+
comment: "GitHub PURL"

0 commit comments

Comments
 (0)