Skip to content

Commit 5c82ccd

Browse files
committed
Incorporate intermediate "trigger named" workflows as workflow_run can only trigger on the workflow name
1 parent eb9a804 commit 5c82ccd

File tree

7 files changed

+68
-19
lines changed

7 files changed

+68
-19
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Trigger - Test extra build
3+
4+
on:
5+
workflow_call:
6+
7+
permissions:
8+
contents: read
9+
packages: read
10+
# To report GitHub Actions status checks
11+
statuses: write
12+
13+
jobs:
14+
extra:
15+
runs-on: ubuntu-latest
16+
steps:
17+
# No-op job to trigger workflow 'extra.yml' via workflow_run
18+
- uses: jakejarvis/wait-action@master
19+
with:
20+
time: '1s'

.github/workflows/extra.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ name: Test extra build
88
on:
99
workflow_dispatch:
1010
workflow_run:
11-
workflows: ["extra"]
12-
types:
13-
- completed
11+
workflows: ["Trigger - Test extra build"]
12+
types: [completed,requested]
1413

1514
permissions:
1615
contents: read

.github/workflows/main.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,29 +127,20 @@ jobs:
127127
needs: files_changed
128128
if: |
129129
needs.files_changed.outputs.stackhpc == 'true'
130-
runs-on: ubuntu-latest
131-
steps:
132-
# No-op job to trigger workflow 'stackhpc.yml' via workflow_run
133-
- uses: mattdesl/no-op@32ec85ff176f761f607087006bda993440da5fe4
130+
uses: ./.github/workflows/stackhpc-trigger.yml
134131

135132
extra:
136133
name: Test extra build
137134
needs: files_changed
138135
if: |
139136
github.event_name != 'pull_request' && needs.files_changed.outputs.extra_on_push == 'true' ||
140137
github.event_name == 'pull_request' && needs.files_changed.outputs.extra_on_pull_request == 'true'
141-
runs-on: ubuntu-latest
142-
steps:
143-
# No-op job to trigger workflow 'extra.yml' via workflow_run
144-
- uses: mattdesl/no-op@32ec85ff176f761f607087006bda993440da5fe4
138+
uses: ./.github/workflows/extra-trigger.yml
145139

146140
trivyscan:
147141
name: Trivy scan image for vulnerabilities
148142
needs: files_changed
149143
if: |
150144
github.event_name == 'pull_request' &&
151145
needs.files_changed.outputs.trivyscan == 'true'
152-
runs-on: ubuntu-latest
153-
steps:
154-
# No-op job to trigger workflow 'trivyscan.yml' via workflow_run
155-
- uses: mattdesl/no-op@32ec85ff176f761f607087006bda993440da5fe4
146+
uses: ./.github/workflows/trivyscan-trigger.yml
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Trigger - Test deployment and reimage on OpenStack
3+
4+
on:
5+
workflow_call:
6+
7+
permissions:
8+
contents: read
9+
packages: read
10+
# To report GitHub Actions status checks
11+
statuses: write
12+
13+
jobs:
14+
stackhpc:
15+
runs-on: ubuntu-latest
16+
steps:
17+
# No-op job to trigger workflow 'stackhpc.yml' via workflow_run
18+
- uses: jakejarvis/wait-action@master
19+
with:
20+
time: '1s'

.github/workflows/stackhpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: Test deployment and reimage on OpenStack
88
on:
99
workflow_dispatch:
1010
workflow_run:
11-
workflows: ["stackhpc"]
11+
workflows: ["Trigger - Test deployment and reimage on OpenStack"]
1212
types:
1313
- completed
1414

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Trigger - Trivy scan image for vulnerabilities
3+
4+
on:
5+
workflow_call:
6+
7+
permissions:
8+
contents: read
9+
packages: read
10+
# To report GitHub Actions status checks
11+
statuses: write
12+
13+
jobs:
14+
trivyscan:
15+
runs-on: ubuntu-latest
16+
steps:
17+
# No-op job to trigger workflow 'trivyscan.yml' via workflow_run
18+
- uses: jakejarvis/wait-action@master
19+
with:
20+
time: '1s'

.github/workflows/trivyscan.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ name: Trivy scan image for vulnerabilities
88
on:
99
workflow_dispatch:
1010
workflow_run:
11-
workflows: ["trivyscan"]
12-
types:
13-
- completed
11+
workflows: ["Trigger - Trivy scan image for vulnerabilities"]
12+
types: [completed,requested]
1413

1514
permissions:
1615
contents: read

0 commit comments

Comments
 (0)