Skip to content

Commit 7fadc19

Browse files
committed
Fix workflow execution:
1. change trivvy to trivy 2. extra, stackhpc, and trivyscan workflows should trigger on workflow_call and workflow_dispatch
1 parent ab3f44d commit 7fadc19

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.github/workflows/extra.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
name: Test extra build
88
on:
9+
workflow_call:
910
workflow_dispatch:
1011

1112
permissions:

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
stackhpc: ${{ toJson(fromJson(steps.filter_on_every.outputs.stackhpc) || fromJson(steps.filter_on_some.outputs.stackhpc)) }}
4646
extra_on_push: ${{ steps.filter_on_some.outputs.extra_on_push }}
4747
extra_on_pull_request: ${{ steps.filter_on_some.outputs.extra_on_pull_request }}
48-
trivvyscan: ${{ steps.filter_on_some.outputs.trivvyscan }}
48+
trivyscan: ${{ steps.filter_on_some.outputs.trivyscan }}
4949
steps:
5050
- name: Checkout
5151
uses: actions/checkout@v4
@@ -109,7 +109,7 @@ jobs:
109109
- 'ansible/roles/cuda/**'
110110
- 'ansible/roles/lustre/**'
111111
- '.github/workflows/extra.yml'
112-
trivvyscan:
112+
trivyscan:
113113
- 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
114114
115115
- name: Paths matched output
@@ -120,7 +120,7 @@ jobs:
120120
echo '{ "stackhpc_some_files": ${{ steps.filter_on_some.outputs.stackhpc_files }} }' | jq -r '.';
121121
echo '{ "extra_on_push_files": ${{ steps.filter_on_some.outputs.extra_on_push_files }} }' | jq -r '.';
122122
echo '{ "extra_on_pull_request_files": ${{ steps.filter_on_some.outputs.extra_on_pull_request_files }} }' | jq -r '.';
123-
echo '{ "trivvyscan_files": ${{ steps.filter_on_some.outputs.trivvyscan_files }} }' | jq -r '.'
123+
echo '{ "trivyscan_files": ${{ steps.filter_on_some.outputs.trivyscan_files }} }' | jq -r '.'
124124
125125
stackhpc:
126126
name: Test deployment and reimage on OpenStack
@@ -139,11 +139,11 @@ jobs:
139139
uses: ./.github/workflows/extra.yml
140140
secrets: inherit
141141

142-
trivvyscan:
142+
trivyscan:
143143
name: Trivy scan image for vulnerabilities
144144
needs: files_changed
145145
if: |
146146
github.event_name == 'pull_request' &&
147-
needs.files_changed.outputs.trivvyscan == 'true'
148-
uses: ./.github/workflows/trivvyscan.yml
147+
needs.files_changed.outputs.trivyscan == 'true'
148+
uses: ./.github/workflows/trivyscan.yml
149149
secrets: inherit

.github/workflows/stackhpc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
name: Test deployment and reimage on OpenStack
88
on:
9+
workflow_call:
910
workflow_dispatch:
1011

1112
permissions:

.github/workflows/trivyscan.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
name: Trivy scan image for vulnerabilities
88
on:
9+
workflow_call:
910
workflow_dispatch:
1011

1112
permissions:

0 commit comments

Comments
 (0)