Skip to content

Commit f248842

Browse files
committed
[CI] Re-enable Trivy scan in ci-pr.yml
Also set scan by default in ci.yml
1 parent 9f9d289 commit f248842

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/ci-pr.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,14 @@ jobs:
105105
-PspringBootVersion="$BOOT_VERSION" \
106106
-PsampleTests \
107107
:runAllSampleTests
108+
scan:
109+
needs: [prerequisites]
110+
if: needs.prerequisites.outputs.runjobs
111+
uses: ./.github/workflows/trivy-scan.yml
112+
108113
done:
109114
runs-on: ubuntu-latest
110-
needs: [ build_and_verify, check_samples ]
115+
needs: [ build_and_verify, check_samples, scan ]
111116
steps:
112117
- name: 'Done'
113118
shell: bash

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
inputs:
1515
run-trivy-scan:
1616
description: 'Run Trivy scan ?'
17-
default: false
17+
default: true
1818
required: false
1919
type: boolean
2020

0 commit comments

Comments
 (0)