[CI] Re-enable Trivy scan in ci-pr.yml

Also set scan by default in ci.yml
spring-projects · Nov 22, 2024 · a73d01e · a73d01e
1 parent 9834edc
commit a73d01e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -103,9 +103,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
@@ -10,7 +10,7 @@ on:
     inputs:
       run-trivy-scan:
         description: 'Run Trivy scan ?'
-        default: false
+        default: true
         required: false
         type: boolean