Skip to content

Commit fbc7f93

Browse files
committed
Improve conditional checks in main pipeline to handle skipped jobs based on user inputs
1 parent 293150e commit fbc7f93

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/main-pipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
if: |
111111
!cancelled() &&
112112
!inputs.skip-docker &&
113-
(needs.ci.result == 'success' || needs.ci.result == 'skipped') && (
113+
(needs.ci.result == 'success' || (needs.ci.result == 'skipped' && inputs.skip-tests)) && (
114114
inputs.force-all ||
115115
(github.event_name == 'workflow_dispatch') ||
116116
needs.detect-changes.outputs.app-changed == 'true'
@@ -130,7 +130,7 @@ jobs:
130130
if: |
131131
!cancelled() &&
132132
!inputs.skip-terraform &&
133-
(needs.docker.result == 'success' || needs.docker.result == 'skipped') && (
133+
(needs.docker.result == 'success' || (needs.docker.result == 'skipped' && inputs.skip-docker)) && (
134134
inputs.force-all ||
135135
(github.event_name == 'workflow_dispatch') ||
136136
needs.detect-changes.outputs.infra-changed == 'true'
@@ -150,7 +150,7 @@ jobs:
150150
if: |
151151
!cancelled() &&
152152
!inputs.skip-argocd &&
153-
(needs.terraform.result == 'success' || needs.terraform.result == 'skipped') && (
153+
(needs.terraform.result == 'success' || (needs.terraform.result == 'skipped' && inputs.skip-terraform)) && (
154154
inputs.force-all ||
155155
(github.event_name == 'workflow_dispatch') ||
156156
needs.detect-changes.outputs.infra-changed == 'true'
@@ -170,7 +170,7 @@ jobs:
170170
if: |
171171
!cancelled() &&
172172
!inputs.skip-deployment &&
173-
(needs.argocd.result == 'success' || needs.argocd.result == 'skipped') && (
173+
(needs.argocd.result == 'success' || (needs.argocd.result == 'skipped' && inputs.skip-argocd)) && (
174174
inputs.force-all ||
175175
(github.event_name == 'workflow_dispatch') ||
176176
needs.detect-changes.outputs.infra-changed == 'true'
@@ -190,7 +190,7 @@ jobs:
190190
if: |
191191
!cancelled() &&
192192
!inputs.skip-monitoring &&
193-
(needs.deployment.result == 'success' || needs.deployment.result == 'skipped') && (
193+
(needs.deployment.result == 'success' || (needs.deployment.result == 'skipped' && inputs.skip-deployment)) && (
194194
inputs.force-all ||
195195
(github.event_name == 'workflow_dispatch') ||
196196
needs.detect-changes.outputs.infra-changed == 'true'

0 commit comments

Comments
 (0)