File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -156,7 +156,7 @@ jobs:
156156
157157 approval :
158158 needs : get-jobs
159- if : ${{ github.event_name == 'issue_comment' && needs.get-jobs.outputs.pr-number != '' && needs.get-jobs.outputs.generator-args != '' }}
159+ if : ${{ ( github.event_name == 'issue_comment' && needs.get-jobs.outputs.pr-number != '' && needs.get-jobs.outputs.generator-args != '') || (github.event_name == 'push' && needs.get-jobs.outputs.generator-args != '') }}
160160 runs-on : ubuntu-latest
161161 name : approval
162162 environment : bryan-test
@@ -165,7 +165,7 @@ jobs:
165165
166166 validate :
167167 needs : [get-jobs, approval]
168- if : ${{ github.event_name == 'issue_comment' && needs.get-jobs.outputs.pr-number != '' && needs.get-jobs.outputs.generator-args != '' }}
168+ if : ${{ github.event_name == 'issue_comment' && needs.get-jobs.outputs.pr-number != '' && needs.get-jobs.outputs.generator-args != '' && needs.approval.result == 'success' }}
169169 uses : ./.github/workflows/e2e-tests.yml
170170 name : validate
171171 secrets : inherit
@@ -175,8 +175,8 @@ jobs:
175175 ref : refs/pull/${{ needs.get-jobs.outputs.pr-number }}/head
176176
177177 validate-nonpr :
178- needs : get-jobs
179- if : ${{ github.event_name != 'issue_comment ' && needs.get-jobs.outputs.generator-args != '' }}
178+ needs : [ get-jobs, approval]
179+ if : ${{ needs.get-jobs.outputs.generator-args != '' && (( github.event_name == 'push ' && needs.approval.result == 'success') || github.event_name == 'workflow_dispatch') }}
180180 uses : ./.github/workflows/e2e-tests.yml
181181 name : validate (manual/push)
182182 secrets : inherit
You can’t perform that action at this time.
0 commit comments