IT-3921: Fix periodic image scan and image rebuild (#8)

Need \!cancelled() && to make next job step run
Sage-Bionetworks-IT · Nov 6, 2024 · 38cb942 · 38cb942
1 parent 030adbc
commit 38cb942
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -27,6 +27,11 @@ on:
 
 env:
   sarif_file_name: trivy-results.sarif
+  # downloading the trivy-db from its default GitHub location fails because
+  # the site experiences too many downloads.  The fix is to pull from this
+  # alternate location.
+  TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2
+  TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db:1
 
 jobs:
   trivy:

diff --git a/.github/workflows/trivy_periodic_image_scan.yml b/.github/workflows/trivy_periodic_image_scan.yml
@@ -38,7 +38,7 @@ jobs:
   update-image:
     needs: periodic-scan
     runs-on: ubuntu-latest
-    if: ${{needs.periodic-scan.outputs.trivy_conclusion == 'failure' }}
+    if: ${{!cancelled() && needs.periodic-scan.outputs.trivy_conclusion == 'failure' }}
     # tag the repo to trigger a new build
     steps:
       - name: Bump version and push tag