Skip to content

Commit

Permalink
Merge branch 'main' into release/r-4.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeljcollinsuk authored May 10, 2024
2 parents c55f4ca + a78718d commit 046ccc8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/scan-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- name: Scan Image
id: scan_image
uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 # v0.19.0
uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
with:
image-ref: analytical-platform-rshiny-open-source-base
exit-code: 1
Expand All @@ -42,14 +42,14 @@ jobs:
- name: Upload SARIF
if: always()
id: upload_sarif
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
with:
sarif_file: trivy-results.sarif

- name: Scan Image (On SARIF Scan Failure)
if: failure() && steps.scan_image.outcome == 'failure'
id: scan_image_on_failure
uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55 # v0.19.0
uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
with:
image-ref: analytical-platform-rshiny-open-source-base
exit-code: 1
Expand Down

0 comments on commit 046ccc8

Please sign in to comment.