Skip to content

Commit 3545b39

Browse files
committed
fix: pin CycloneDX version to 1.6
1 parent 621f16a commit 3545b39

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

sbom-sign-scan/action.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,13 @@ runs:
221221
cyclonedx-npm --flatten-components > fs.cdx.bom.json
222222
elif [[ ${{inputs.enable_sbom}} == 'true' && ${{inputs.source_code_sbom_type}} == 'helm' ]]
223223
then
224-
cdxgen ./ --project-version "${{ inputs.rearm_full_version }}" --lifecyle build -t helm -o fs.cdx.bom.json
224+
cdxgen ./ --project-version "${{ inputs.rearm_full_version }}" --lifecyle build --spec-version 1.6 -t helm -o fs.cdx.bom.json
225225
elif [[ ${{inputs.enable_sbom}} == 'true' && ${{inputs.source_code_sbom_type}} == 'go' ]]
226226
then
227-
cdxgen ./ --project-version "${{ inputs.rearm_full_version }}" --lifecycle build -t go -o fs.cdx.bom.json
227+
cdxgen ./ --project-version "${{ inputs.rearm_full_version }}" --lifecycle build --spec-version 1.6 -t go -o fs.cdx.bom.json
228228
elif [[ ${{inputs.enable_sbom}} == 'true' && ${{inputs.source_code_sbom_type}} == 'other' ]]
229229
then
230-
cdxgen ./ --project-version "${{ inputs.rearm_full_version }}" --lifecycle build -o fs.cdx.bom.json
230+
cdxgen ./ --project-version "${{ inputs.rearm_full_version }}" --lifecycle build --spec-version 1.6 -o fs.cdx.bom.json
231231
elif [[ ${{inputs.enable_sbom}} == 'true' && ${{inputs.source_code_sbom_type}} == 'custom' ]]
232232
then
233233
docker build -t sbom-container -f Dockerfile.sbom --build-arg VERSION="${{inputs.rearm_full_version}}" .
@@ -257,7 +257,7 @@ runs:
257257
then
258258
export FETCH_LICENSE=false
259259
pip install blint==3.1.2
260-
cdxgen docker-${{inputs.rearm_short_version}}.tar -t docker --lifecycle build --project-version "${{ inputs.rearm_full_version }}" -o docker.cdx.bom.raw.json
260+
cdxgen docker-${{inputs.rearm_short_version}}.tar -t docker --lifecycle build --project-version "${{ inputs.rearm_full_version }}" --spec-version 1.6 -o docker.cdx.bom.raw.json
261261
du -h ./docker.cdx.bom.raw.json
262262
rearm bomutils fixpurl -f ./docker.cdx.bom.raw.json -o ./docker.cdx.bom.json --newpurl "${purl}"
263263

0 commit comments

Comments
 (0)