Skip to content

Commit a73d01e

Browse files
committed
[CI] Re-enable Trivy scan in ci-pr.yml
Also set scan by default in ci.yml
1 parent 9834edc commit a73d01e

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
@@ -103,9 +103,14 @@ jobs:
103103
-PspringBootVersion="$BOOT_VERSION" \
104104
-PsampleTests \
105105
:runAllSampleTests
106+
scan:
107+
needs: [prerequisites]
108+
if: needs.prerequisites.outputs.runjobs
109+
uses: ./.github/workflows/trivy-scan.yml
110+
106111
done:
107112
runs-on: ubuntu-latest
108-
needs: [ build_and_verify, check_samples ]
113+
needs: [ build_and_verify, check_samples, scan ]
109114
steps:
110115
- name: 'Done'
111116
shell: bash

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
inputs:
1111
run-trivy-scan:
1212
description: 'Run Trivy scan ?'
13-
default: false
13+
default: true
1414
required: false
1515
type: boolean
1616

0 commit comments

Comments
 (0)