Skip to content

Commit 17bba3d

Browse files
Fixed recursion bug
1 parent 99ee44b commit 17bba3d

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

.github/workflows/generate_sbom.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ jobs:
6161
activate-environment: true
6262
enable-cache: true
6363

64-
# - name: Install dependencies
65-
# run: uv sync --group sbom
64+
- name: Install dependencies
65+
run: |
66+
uv sync --group generate_sbom
6667
6768
- name: generate_sbom.py
6869
run: uv run etc/sbom/generate_sbom.py --enable-github-action-token --target=branch --sbom-metadata=etc/sbom/metadata.cdx.json --save-warnings=${{runner.temp}}/warnings.txt

etc/sbom/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
for component in endor_components_remove:
3030
for prefix in prefixes:
31-
endor_components_remove.append(prefix + component)
31+
component = prefix + component
3232

3333
# ################ Component Renaming ################
3434
# Endor does not have syntactically valid PURLs for C/C++ packages.

etc/sbom/generate_sbom.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
# /// script
2-
# dependencies = [
3-
# "gitpython",
4-
# "pygithub",
5-
# "semver",
6-
# ]
7-
# ///
81
#!/usr/bin/env python3
92
"""
103
Generate a CycloneDX SBOM using scan results from Endor Labs.

pyproject.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ make_release = [
5353
"pygithub>=2.1",
5454
]
5555

56+
generate_sbom = [
57+
# etc/sbom/*.py
58+
"gitpython>=3.1",
59+
"pygithub>=2.1",
60+
"semver>=3.0.0",
61+
]
62+
5663
[tool.ruff]
5764
line-length = 120
5865
src = [".evergreen", "etc"]

0 commit comments

Comments
 (0)