Skip to content

Commit 1c69fa8

Browse files
[WIP] Fix env vars and missing project name parameter
1 parent bd58fd9 commit 1c69fa8

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

‎.github/workflows/sbom-matrix.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ jobs:
321321
env:
322322
DT_BASE_URL: ${{ vars.DEPENDENCY_TRACK_BASE_URL }}
323323
DT_API_KEY: ${{ secrets.DEPENDENCY_TRACK_API_KEY }}
324+
DT_ROOT_OBJECT_ID: ${{ vars.DT_ROOT_OBJECT_ID }}
324325
IONOS_CA_CERT: ${{ secrets.IONOS_CA }}
325326
MATRIX_CONTEXT: ${{ needs.setup-matrix.outputs.matrix }}
326327
PROJECT_VERSION: ${{ needs.get-version.outputs.project_version }}
@@ -385,6 +386,7 @@ jobs:
385386
composer_output=$(echo "$component_json" | jq -r '.composer_output')
386387
npm_output=$(echo "$component_json" | jq -r '.npm_output')
387388
component_name=$(echo "$component_json" | jq -r '.name')
389+
project_name=$(echo "$component_json" | jq -r '.project_name')
388390
389391
echo "Processing component: ${component_name}"
390392
@@ -396,13 +398,13 @@ jobs:
396398
if [[ "$composer_output" != "null" ]]; then
397399
bom_file=$(echo "$component_json" | jq -r '.composer_output')
398400
399-
upload_bom "$bom_file" "${DEPENDENCY_TRACK_ROOT_OBJECT_ID}" "$project_name" "composer" || exit 1
401+
upload_bom "$bom_file" "${DT_ROOT_OBJECT_ID}" "$project_name" "composer" || exit 1
400402
fi
401403
402404
if [[ "$npm_output" != "null" ]]; then
403405
bom_file=$(echo "$component_json" | jq -r '.npm_output')
404406
405-
upload_bom "$bom_file" "${DEPENDENCY_TRACK_ROOT_OBJECT_ID}" "$project_name" "npm" || exit 1
407+
upload_bom "$bom_file" "${DT_ROOT_OBJECT_ID}" "$project_name" "npm" || exit 1
406408
fi
407409
done
408410

0 commit comments

Comments
 (0)