Skip to content

Commit 3ebd218

Browse files
authored
Merge pull request #125 from Potafe/main
fix: add version input
2 parents d358cdc + f61fd4b commit 3ebd218

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
with:
1212
docpath: ${{github.workspace}}/test/json/input
1313
name: sample-sbom-json
14+
version: "1"
1415
mergetype: "1" # 0 shallow merge, 1 deep merge
1516
author: "ci/cd build pipeline"
1617
email: "test@mail.com"
@@ -25,6 +26,7 @@ jobs:
2526
with:
2627
docpath: ${{github.workspace}}/test/spdx/input
2728
name: sample-sbom-spdx
29+
version: "1"
2830
mergetype: "0" # 0 shallow merge, 1 deep merge
2931
author: "ci/cd build pipeline"
3032
email: "test@mail.com"

action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ inputs:
1111
name:
1212
description: "Name of product for which SBoM is created"
1313
mandatory: true
14+
version:
15+
description: "Version of product for which SBoM is created"
16+
mandatory: true
1417
mergetype:
1518
description: "Type of merge: 0 for shallow merge, 1 for deep merge"
1619
mandatory: false
@@ -33,6 +36,7 @@ runs:
3336
env:
3437
DOCPATH: ${{ inputs.docpath }}
3538
NAME: ${{ inputs.name }}
39+
VERSION: ${{ inputs.version }}
3640
MERGETYPE: ${{ inputs.mergetype }}
3741
AUTHOR: ${{ inputs.author }}
3842
EMAIL: ${{ inputs.email }}

entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ python3 /app/spdxmerge/SPDXMerge.py \
1515
--docpath "$DOCPATH" \
1616
--outpath "$OUTPATH" \
1717
--name "$NAME" \
18-
--name "$VERSION" \
18+
--version "$VERSION" \
1919
--mergetype $MERGETYPE \
2020
--author "$AUTHOR" \
2121
--email "$EMAIL" \

0 commit comments

Comments
 (0)