Skip to content

Clean up generation of SPDX package IDs. #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Malcolmnixon merged 1 commit into from
Jul 10, 2024
Merged

Clean up generation of SPDX package IDs. #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions spdx-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ parameters:
# Steps
steps:

# Get the version of a package in an SPDX document
# Get the version of SpdxTool
- command: get-version
inputs:
output: spdxtool-version
output: version
spdx: ${{ tool-spdx }}
name: DemaConsulting.SpdxTool

# Rename the package ID for the platform library
# Rename the package ID for SpdxTool
- command: rename-id
displayName: Rename SpdxTool Package ID
inputs:
spdx: ${{ tool-spdx }}
old: SPDXRef-RootPackage
new: SPDXRef-DemaConsulting-SpdxTool-${{ spdxtool-version }}
new: SPDXRef-Package-DemaConsulting-SpdxTool-${{ version }}

# Query for DotNet version
- command: run-workflow
Expand Down Expand Up @@ -55,38 +55,38 @@ steps:
id: SPDXRef-Package-DotNet-${{ dotnet-version }}
relationships:
- type: BUILD_TOOL_OF
element: SPDXRef-DemaConsulting-SpdxTool-${{ spdxtool-version }}
element: SPDXRef-Package-DemaConsulting-SpdxTool-${{ version }}
comment: DemaConsulting.SpdxModel compiled by DotNet ${{ dotnet-version }}

# Update the Sha256 digest on the tool SPDX document
# Update the Sha256 digest on the SpdxTool SBOM
- command: hash
displayName: Update SpdxTool Sha256
inputs:
operation: generate
algorithm: sha256
file: ${{ tool-spdx }}

# Validate the tool SPDX document
# Validate the SpdxTool SBOM
- command: validate
displayName: Validate SpdxTool SBOM
inputs:
spdx: ${{ tool-spdx }}

# Generate the tool summary
# Generate the SpdxTool summary
- command: to-markdown
displayName: Generate SpdxTool SBOM Summary
inputs:
spdx: ${{ tool-spdx }}
markdown: ${{ tool-summary-md }}
title: 'SpdxTool Package'

# Rename the package ID for the platform library
# Rename the package ID for SpdxTool.Tests
- command: rename-id
displayName: Rename SpdxTool Tests Package ID
inputs:
spdx: ${{ tests-spdx }}
old: SPDXRef-RootPackage
new: SPDXRef-DemaConsulting-SpdxTool-Tests-${{ spdxtool-version }}
new: SPDXRef-Package-DemaConsulting-SpdxTool-Tests-${{ version }}

# Add DotNet package
- command: run-workflow
Expand All @@ -106,21 +106,21 @@ steps:
id: SPDXRef-Package-DotNet-${{ dotnet-version }}
relationships:
- type: BUILD_TOOL_OF
element: SPDXRef-DemaConsulting-SpdxTool-Tests-${{ spdxtool-version }}
comment: DemaConsulting.SpdxModel.Tests compiled by DotNet ${{ dotnet-version }}
element: SPDXRef-Package-DemaConsulting-SpdxTool-Tests-${{ version }}
comment: DemaConsulting.SpdxTool.Tests compiled by DotNet ${{ dotnet-version }}
- type: TEST_TOOL_OF
element: SPDXRef-DemaConsulting-SpdxTool-Tests-${{ spdxtool-version }}
comment: DemaConsulting.SpdxModel.Tests executed by DotNet ${{ dotnet-version }}
element: SPDXRef-Package-DemaConsulting-SpdxTool-Tests-${{ version }}
comment: DemaConsulting.SpdxTool.Tests executed by DotNet ${{ dotnet-version }}

# Update the Sha256 digest on the tests SPDX document
# Update the Sha256 digest on the SpdxTool.Tests SBOM
- command: hash
displayName: Update SpdxTool Tests Sha256
inputs:
operation: generate
algorithm: sha256
file: ${{ tests-spdx }}

# Validate the tests SPDX document
# Validate the SpdxTool.Tests SBOM
- command: validate
displayName: Validate SpdxTool Tests SBOM
inputs:
Expand Down