Skip to content

Commit 6534efe

Browse files
committed
chore(azure-integration): bump and pin cdxgen and cyclonedx-npm and add cleanup step
1 parent 796db2f commit 6534efe

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

integrations/azureDevOps/azure-build-submit-template.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
inputs:
9494
version: '22.19.0'
9595
displayName: 'Install Node.js'
96-
- bash: npm install --global @cyclonedx/cyclonedx-npm
96+
- bash: npm install --global @cyclonedx/cyclonedx-npm@4.0.0 --ignore-scripts
9797
condition: ${{ eq(parameters.sbomType, 'npm') }}
9898
displayName: 'Install cyclonedx npm'
9999
- task: UseDotNet@2
@@ -104,7 +104,7 @@ jobs:
104104
- bash: dotnet tool install --global CycloneDX
105105
condition: ${{ eq(parameters.sbomType, 'dotnet') }}
106106
displayName: 'Install cyclonedx .NET'
107-
- bash: npm install -g @cyclonedx/cdxgen@11.7.0
107+
- bash: npm install -g @cyclonedx/cdxgen@11.9.0 --ignore-scripts
108108
displayName: 'Install cdxgen cli'
109109
- bash: |
110110
exit_code=0
@@ -200,4 +200,8 @@ jobs:
200200
displayName: 'SBOM and ReARM metadata'
201201
env:
202202
REARM_API_KEY: ${{ parameters.rearmApiKey }}
203-
REARM_API_KEY_ID: ${{ parameters.rearmApiKeyId }}
203+
REARM_API_KEY_ID: ${{ parameters.rearmApiKeyId }}
204+
- bash: |
205+
rm -rf $(Pipeline.Workspace)/variables/*
206+
displayName: 'Clean up variables directory'
207+
condition: always()

0 commit comments

Comments
 (0)