@@ -316,20 +316,20 @@ jobs:
316316 - uses : aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4 # 0.30
317317 with :
318318 scan-type : fs
319- ignore-unfixed : true
320- severity : HIGH,CRITICAL
321319 format : github
322320 output : dependency-results.sbom.json
323321 github-pat : ${{ github.token }}
324322
325323 - uses : aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4 # 0.30
326324 with :
327325 scan-type : fs
328- ignore-unfixed : true
329- severity : HIGH,CRITICAL
330326 format : sarif
331327 output : trivy-results.sarif
328+ exit-code : ${{ github.event_name == 'pull_request' }}
329+ ignore-unfixed : true
330+ severity : HIGH,CRITICAL
332331 scanners : vuln,secret,misconfig
332+ skip-setup-trivy : true
333333
334334 - uses : github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3
335335 with :
@@ -356,19 +356,19 @@ jobs:
356356 - uses : aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4 # 0.30
357357 with :
358358 image-ref : ${{ steps.build.outputs.imageid }}
359- ignore-unfixed : true
360- severity : HIGH,CRITICAL
361359 format : github
362360 output : dependency-results.sbom.json
363361 github-pat : ${{ github.token }}
364362
365363 - uses : aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4 # 0.30
366364 with :
367365 image-ref : ${{ steps.build.outputs.imageid }}
368- ignore-unfixed : true
369- severity : HIGH,CRITICAL
370366 format : sarif
371367 output : trivy-results.sarif
368+ exit-code : ${{ github.event_name == 'pull_request' }}
369+ ignore-unfixed : true
370+ severity : HIGH,CRITICAL
371+ skip-setup-trivy : true
372372
373373 - uses : github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3
374374 with :
0 commit comments