Skip to content

Commit df12236

Browse files
committed
Update cd-dockerized-hab-package-security-scan.yaml
1 parent 6c87931 commit df12236

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/cd-dockerized-hab-package-security-scan.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
# run grype in runner
123123
grype dir:$PKG_PATH --name ${{ inputs.hab_package }}
124124
# run grype to output to file (which is uploaded to the job as an artifact)
125-
OUTPUT_FILE="grype-results-${{ inputs.hab_package }}.txt"
125+
OUTPUT_FILE="grype-results-ubuntu-${{ inputs.hab_package }}.txt"
126126
OUTPUT_FILE="${OUTPUT_FILE//\//-}"
127127
echo $OUTPUT_FILE
128128
grype dir:$PKG_PATH --name ${{ inputs.hab_package }} > $OUTPUT_FILE
@@ -131,7 +131,7 @@ jobs:
131131
- name: Upload Grype Scan Results
132132
uses: actions/upload-artifact@v4
133133
with:
134-
name: grype-results-${{ matrix.os }}
134+
name: grype-results-ubuntu-${{ env.OUTPUT_FILE }}
135135
path: ${{ env.OUTPUT_FILE }}
136136

137137
grype-scan-windows:
@@ -195,7 +195,7 @@ jobs:
195195
if ([string]::IsNullOrEmpty($AuthToken)) {
196196
$AuthToken = "${{ secrets.HAB_PUBLIC_BLDR_PAT }}"
197197
Write-Host "Using token from repository secret"
198-
} elseif {
198+
} else {
199199
Write-Host "Using token from workflow input"
200200
}
201201
# if (-not [string]::IsNullOrEmpty($AuthToken)) {
@@ -213,7 +213,7 @@ jobs:
213213
# run grype in runner
214214
grype dir:$PKG_PATH --name ${{ inputs.hab_package }}
215215
# run grype to output to file (which is uploaded to the job as an artifact)
216-
OUTPUT_FILE="grype-results-${{ inputs.hab_package }}.txt"
216+
OUTPUT_FILE="grype-results-windows-${{ inputs.hab_package }}.txt"
217217
OUTPUT_FILE="${OUTPUT_FILE//\//-}"
218218
echo $OUTPUT_FILE
219219
grype dir:$PKG_PATH --name ${{ inputs.hab_package }} > $OUTPUT_FILE
@@ -222,5 +222,5 @@ jobs:
222222
- name: Upload Grype Scan Results
223223
uses: actions/upload-artifact@v4
224224
with:
225-
name: grype-results-${{ matrix.os }}
225+
name: grype-results-windows-${{ env.OUTPUT_FILE }}
226226
path: ${{ env.OUTPUT_FILE }}

0 commit comments

Comments
 (0)