Skip to content

Commit

Permalink
Update pkg/skaffold/runner/runcontext/context.go
Browse files Browse the repository at this point in the history
Short circuit the `enabled && disabled` check.

Co-authored-by: Tejal Desai <tejal29@gmail.com>
  • Loading branch information
maggieneterval and tejal29 authored Apr 30, 2021
1 parent f7627f8 commit 257d6e8
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/skaffold/runner/runcontext/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ func (ps Pipelines) StatusCheck() (*bool, error) {
} else {
disabled = true
}
}
}
if enabled && disabled {
return nil, fmt.Errorf("cannot explicitly enable StatusCheck in one pipeline and explicitly disable it in another pipeline, see https://skaffold.dev/docs/workflows/ci-cd/#waiting-for-skaffold-deployments-using-healthcheck")
if enabled && disabled {
return nil, fmt.Errorf("cannot explicitly enable StatusCheck in one pipeline and explicitly disable it in another pipeline, see https://skaffold.dev/docs/workflows/ci-cd/#waiting-for-skaffold-deployments-using-healthcheck")
}
}
}
// set the group status check to disabled if any pipeline has StatusCheck
// set to false.
Expand Down

0 comments on commit 257d6e8

Please sign in to comment.