Skip to content

Commit

Permalink
fix (Laerdal.Builder.targets): we now set the Laerdal_Version_Assembl…
Browse files Browse the repository at this point in the history
…y property so that the sbom script will be satisfied
  • Loading branch information
ksidirop-laerdal committed Nov 12, 2024
1 parent 2bfd5e0 commit c34d30a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
-p:Laerdal_Source_Branch="${{ env.LAERDAL_SOURCE_BRANCH }}" \
-p:Laerdal_Repository_Path="${{ env.LAERDAL_REPOSITORY_PATH }}" \
-p:Laerdal_Github_Access_Token="${{ env.SCL_GITHUB_ACCESS_TOKEN }}" \
-p:Laerdal_Should_Generate_and_Upload_Sbom="true" \
\
-p:Laerdal_Dependency_Tracker_Server_Url="${{ env.SCL_DEPENDENCY_TRACKER_SERVER_URL }}" \
-p:Laerdal_Dependency_Tracker_Api_Key_File_Path="${{ env.BUILD_REPOSITORY_FOLDERPATH }}/Laerdal.Scripts/dependency_tracker_api_key.ppk" \
Expand Down
3 changes: 2 additions & 1 deletion Laerdal.Scripts/Laerdal.Builder.targets
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
<Laerdal_Should_Tag_And_Release Condition=" '$(Laerdal_Should_Tag_And_Release)' == '' and '$(Is_Core_Branch)' == 'true' ">True</Laerdal_Should_Tag_And_Release>
<Laerdal_Should_Generate_and_Upload_Sbom Condition=" '$(Laerdal_Should_Generate_and_Upload_Sbom)' == '' and ( '$(Is_Core_Branch)' == 'true' or '$(Is_Pull_Request)' == 'true' ) ">True</Laerdal_Should_Generate_and_Upload_Sbom>

<Laerdal_Version_Full Condition=" '$(Laerdal_Version_Full)' == '' ">$(Nordic_Package_Version).$(Laerdal_Revision)</Laerdal_Version_Full>
<Laerdal_Version_Full Condition=" '$(Laerdal_Version_Full)' == '' ">$(Nordic_Package_Version).$(Laerdal_Revision)</Laerdal_Version_Full>
<Laerdal_Version_Assembly Condition=" '$(Laerdal_Version_Assembly)' == '' ">$(Laerdal_Version_Full)</Laerdal_Version_Assembly>
</PropertyGroup>

<!-- BUILD -->
Expand Down

0 comments on commit c34d30a

Please sign in to comment.