Skip to content

Commit db0acae

Browse files
authored
Add trivy_enable to workflow
1 parent 958c018 commit db0acae

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/actions/build-node-python/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ inputs:
5959
description: "run node bundle"
6060
default: "false"
6161
required: false
62-
enable_trivy:
62+
trivy_enable:
6363
description: "Enable trivy scans on lock files"
6464
default: "false" # Enable this by default?
6565
required: false
@@ -293,7 +293,7 @@ runs:
293293

294294
# Trivy
295295
- name: Run Trivy vulnerability scanner on uv.lock
296-
if: inputs.enable_trivy == 'true' && inputs.enable_python == 'true'
296+
if: inputs.trivy_enable == 'true' && inputs.enable_python == 'true'
297297
uses: aquasecurity/[email protected]
298298
with:
299299
scan-type: "fs"
@@ -307,7 +307,7 @@ runs:
307307
cache: "false"
308308
continue-on-error: false
309309
- name: Run Trivy vulnerability scanner on yarn.lock
310-
if: inputs.enable_trivy == 'true' && inputs.enable_node == 'true'
310+
if: inputs.trivy_enable == 'true' && inputs.enable_node == 'true'
311311
uses: aquasecurity/[email protected]
312312
with:
313313
scan-type: "fs"

.github/workflows/build-node-python.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ on:
7474
required: false
7575
description: Unique id per workflow run. Must be set to unique value if dispatched multiple times for a single workflow.
7676
default: ""
77+
trivy_enable:
78+
description: "Enable trivy scans on lock files"
79+
default: false # Enable this by default?
80+
type: boolean
81+
required: false
7782
chromatic_enable:
7883
description: 'Enable Chromatic tests'
7984
required: false
@@ -151,6 +156,7 @@ jobs:
151156
enable_python: false
152157
# We probably won't need Rust on Node builds...
153158
# enable_rust: ${{ inputs.rust_enable }}
159+
trivy_enable: ${{ inputs.trivy_enable }}
154160
run_parallel: ${{ inputs.run_parallel }}
155161
node_version: ${{ vars.NODE_VERSION || inputs.node_version }}
156162
npm_registry: ${{ vars.NPM_REGISTRY }}
@@ -191,6 +197,7 @@ jobs:
191197
with:
192198
enable_node: false
193199
enable_python: true
200+
trivy_enable: ${{ inputs.trivy_enable }}
194201
enable_rust: ${{ inputs.rust_enable }}
195202
run_parallel: ${{ inputs.run_parallel }}
196203
node_version: ${{ vars.NODE_VERSION || inputs.node_version }}
@@ -282,6 +289,7 @@ jobs:
282289
- name: Build node and python
283290
uses: ./tmp/github-workflows/.github/actions/build-node-python
284291
with:
292+
trivy_enable: ${{ inputs.trivy_enable }}
285293
enable_rust: ${{ inputs.rust_enable }}
286294
run_parallel: ${{ inputs.run_parallel }}
287295
node_version: ${{ vars.NODE_VERSION || inputs.node_version }}
@@ -425,6 +433,7 @@ jobs:
425433
- name: Build node and python
426434
uses: ./tmp/github-workflows/.github/actions/build-node-python
427435
with:
436+
trivy_enable: ${{ inputs.trivy_enable }}
428437
enable_rust: ${{ inputs.rust_enable }}
429438
run_parallel: ${{ inputs.run_parallel }}
430439
node_version: ${{ vars.NODE_VERSION || inputs.node_version }}

0 commit comments

Comments
 (0)