From f248842332178125b310526ff99319308cab61a7 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Fri, 22 Nov 2024 12:51:00 -0600
Subject: [PATCH] [CI] Re-enable Trivy scan in ci-pr.yml

Also set scan by default in ci.yml
---
 .github/workflows/ci-pr.yml | 7 ++++++-
 .github/workflows/ci.yml    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index 649f19e5..85d6f877 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -105,9 +105,14 @@ jobs:
               -PspringBootVersion="$BOOT_VERSION" \
               -PsampleTests \
               :runAllSampleTests
+  scan:
+    needs: [prerequisites]
+    if: needs.prerequisites.outputs.runjobs
+    uses: ./.github/workflows/trivy-scan.yml
+
   done:
     runs-on: ubuntu-latest
-    needs: [ build_and_verify, check_samples ]
+    needs: [ build_and_verify, check_samples, scan ]
     steps:
       - name: 'Done'
         shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 339c0fe1..a68a158a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ on:
     inputs:
       run-trivy-scan:
         description: 'Run Trivy scan ?'
-        default: false
+        default: true
         required: false
         type: boolean