Skip to content

Commit

Permalink
adding back some lines that got lost in a merge (#43)
Browse files Browse the repository at this point in the history
  • Loading branch information
decarboxy committed Jun 30, 2020
1 parent 2251a3d commit 942d519
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.3-1.2.1-cyrus
2.4.3-1.2.2-cyrus
13 changes: 13 additions & 0 deletions cmd/argoexec/commands/wait.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package commands

import (
"github.com/cyrusbiotechnology/argo/workflow/executor"
"time"

"github.com/argoproj/pkg/stats"
Expand Down Expand Up @@ -73,6 +74,18 @@ func waitContainer() error {
return err
}

err = wfExecutor.EvaluateConditions(executor.ConditionTypeError)
if err != nil {
wfExecutor.AddError(err)
return err
}

err = wfExecutor.EvaluateConditions(executor.ConditionTypeWarning)
if err != nil {
wfExecutor.AddError(err)
return err
}

// To prevent the workflow step from completing successfully, return the error occurred during wait.
if waitErr != nil {
return waitErr
Expand Down

0 comments on commit 942d519

Please sign in to comment.